diff -Nru lxsession-edit-0.2.0/COPYING lxsession-edit-0.2.0~svn20090913/COPYING --- lxsession-edit-0.2.0/COPYING 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/COPYING 2009-09-13 11:06:52.000000000 +0000 @@ -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., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 Lesser 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. - - 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. +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. For example, if you distribute copies of such a program, whether -gratis or for a fee, you must 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. - - 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. - - 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. - - 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. +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. The precise terms and conditions for copying, distribution and modification follow. - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. - 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". - -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. - - 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. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the 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: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - 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. - - 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. - -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. - -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. - - 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: - - 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, - - 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, - - 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 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. - -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. - - 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. - - 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 + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of this License. - 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. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 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. +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. - 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 + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program -specifies 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. - - 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. - - NO WARRANTY - - 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. - - 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. + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS - How to Apply These Terms to Your New Programs + 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 @@ 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, @@ -303,37 +644,31 @@ 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. + You should have received a copy of the GNU General Public License + 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. - -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: - - 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 Lesser General -Public License instead of this License. +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + 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 -Nru lxsession-edit-0.2.0/INSTALL lxsession-edit-0.2.0~svn20090913/INSTALL --- lxsession-edit-0.2.0/INSTALL 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/INSTALL 2009-09-13 11:06:52.000000000 +0000 @@ -2,12 +2,10 @@ ************************* Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +2006, 2007, 2008 Free Software Foundation, Inc. - Copying and distribution of this file, with or without modification, -are permitted in any medium without royalty provided the copyright -notice and this notice are preserved. This file is offered as-is, -without warranty of any kind. + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. Basic Installation ================== @@ -15,11 +13,7 @@ Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented -below. The lack of an optional feature in a given package is not -necessarily a bug. More recommendations for GNU packages can be found -in *note Makefile Conventions: (standards)Makefile Conventions. +instructions specific to this package. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -48,7 +42,7 @@ you want to change it or regenerate `configure' using a newer version of `autoconf'. - The simplest way to compile this package is: +The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -59,22 +53,12 @@ 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package, generally using the just-built uninstalled binaries. + the package. 4. Type `make install' to install the programs and any data files and - documentation. When installing into a prefix owned by root, it is - recommended that the package be configured and built as a regular - user, and only the `make install' phase executed with root - privileges. - - 5. Optionally, type `make installcheck' to repeat any self-tests, but - this time using the binaries in their final installed location. - This target does not install anything. Running this target as a - regular user, particularly if the prior `make install' required - root privileges, verifies that the installation completed - correctly. + documentation. - 6. You can remove the program binaries and object files from the + 5. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -83,15 +67,8 @@ all sorts of other programs in order to regenerate files that came with the distribution. - 7. Often, you can also type `make uninstall' to remove the installed - files again. In practice, not all packages have tested that - uninstallation works correctly, even though it is required by the - GNU Coding Standards. - - 8. Some packages, particularly those that use Automake, provide `make - distcheck', which can by used by developers to test that all other - targets like `make install' and `make uninstall' work correctly. - This target is generally not run by end users. + 6. Often, you can also type `make uninstall' to remove the installed + files again. Compilers and Options ===================== @@ -116,8 +93,7 @@ own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. This -is known as a "VPATH" build. +source code in the directory that `configure' is in and in `..'. With a non-GNU `make', it is safer to compile the package for one architecture at a time in the source code directory. After you have @@ -144,8 +120,7 @@ By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX', where PREFIX must be an -absolute file name. +`configure' the option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you @@ -156,46 +131,15 @@ In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. In general, the -default for these options is expressed in terms of `${prefix}', so that -specifying just `--prefix' will affect all of the other directory -specifications that were not explicitly provided. - - The most portable way to affect installation locations is to pass the -correct locations to `configure'; however, many packages provide one or -both of the following shortcuts of passing variable assignments to the -`make install' command line to change installation locations without -having to reconfigure or recompile. - - The first method involves providing an override variable for each -affected directory. For example, `make install -prefix=/alternate/directory' will choose an alternate location for all -directory configuration variables that were expressed in terms of -`${prefix}'. Any directories that were specified during `configure', -but not in terms of `${prefix}', must each be overridden at install -time for the entire installation to be relocated. The approach of -makefile variable overrides for each directory variable is required by -the GNU Coding Standards, and ideally causes no recompilation. -However, some platforms have known limitations with the semantics of -shared libraries that end up requiring recompilation when using this -method, particularly noticeable in packages that use GNU Libtool. - - The second method involves providing the `DESTDIR' variable. For -example, `make install DESTDIR=/alternate/directory' will prepend -`/alternate/directory' before all installation names. The approach of -`DESTDIR' overrides is not required by the GNU Coding Standards, and -does not work on platforms that have drive letters. On the other hand, -it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of `${prefix}' -at `configure' time. - -Optional Features -================= +you can set and what kinds of files go in them. If the package supports it, you can cause programs to be installed with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. +Optional Features +================= + Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE @@ -208,13 +152,6 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. - Some packages offer the ability to configure how verbose the -execution of `make' will be. For these packages, running `./configure ---enable-silent-rules' sets the default to minimal output, which can be -overridden with `make V=1'; while running `./configure ---disable-silent-rules' sets the default to verbose, which can be -overridden with `make V=0'. - Particular systems ================== @@ -222,7 +159,7 @@ CC is not installed, it is recommended to use the following options in order to use an ANSI C compiler: - ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + ./configure CC="cc -Ae" and if that doesn't work, install pre-built binaries of GCC for HP-UX. @@ -237,16 +174,6 @@ ./configure CC="cc -nodtk" - On Solaris, don't put `/usr/ucb' early in your `PATH'. This -directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. - - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: - - ./configure --prefix=/boot/common - Specifying the System Type ========================== @@ -262,8 +189,7 @@ where SYSTEM can have one of these forms: - OS - KERNEL-OS + OS KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't @@ -351,7 +277,7 @@ `configure' can determine that directory automatically. `--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: + Use DIR as the installation prefix. *Note Installation Names:: for more details, including other options available for fine-tuning the installation locations. diff -Nru lxsession-edit-0.2.0/Makefile.am lxsession-edit-0.2.0~svn20090913/Makefile.am --- lxsession-edit-0.2.0/Makefile.am 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/Makefile.am 2009-09-05 21:29:07.000000000 +0000 @@ -3,9 +3,9 @@ SUBDIRS = src po desktopdir = $(datadir)/applications -desktop_in_files = lxsession-edit.desktop.in -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -@INTLTOOL_DESKTOP_RULE@ +desktop_DATA = lxsession-edit.desktop + +#@INTLTOOL_DESKTOP_RULE@ DISTCLEANFILES = lxsession-edit.desktop #icondir = $(datadir)/share/icons/hicolor/128x128 @@ -13,10 +13,20 @@ uidir=$(datadir)/lxsession-edit # GtkBuilder UI definition files -ui_DATA = data/lxsession-edit.ui +ui_in_files= \ + data/lxsession-edit.glade +ui_DATA = $(ui_in_files:.glade=.ui) EXTRA_DIST = \ autogen.sh \ lxsession-edit.desktop.in \ $(ui_DATA) +CLEANFILES = \ + $(ui_DATA) + +# Generate GtkBuilder UI files from Glade files +%.ui: %.glade + $(GTK_BUILDER_CONVERT) $< $@ + $(top_builddir)/src/xml-purge $@ + diff -Nru lxsession-edit-0.2.0/Makefile.in lxsession-edit-0.2.0~svn20090913/Makefile.in --- lxsession-edit-0.2.0/Makefile.in 2011-07-19 20:18:17.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/Makefile.in 2009-09-13 11:06:52.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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. @@ -17,9 +16,8 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -35,8 +33,9 @@ subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - compile depcomp install-sh ltmain.sh missing + $(srcdir)/lxsession-edit.desktop.in $(top_srcdir)/configure \ + AUTHORS COPYING ChangeLog INSTALL NEWS compile depcomp \ + install-sh ltmain.sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -45,14 +44,7 @@ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +CONFIG_CLEAN_FILES = lxsession-edit.desktop SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -67,29 +59,13 @@ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(uidir)" +desktopDATA_INSTALL = $(INSTALL_DATA) +uiDATA_INSTALL = $(INSTALL_DATA) DATA = $(desktop_DATA) $(ui_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -97,43 +73,16 @@ distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ -ADDITIONAL_FLAGS = @ADDITIONAL_FLAGS@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -158,6 +107,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INSTALL = @INSTALL@ @@ -188,12 +138,9 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -248,20 +195,27 @@ top_srcdir = @top_srcdir@ SUBDIRS = src po desktopdir = $(datadir)/applications -desktop_in_files = lxsession-edit.desktop.in -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +desktop_DATA = lxsession-edit.desktop + +#@INTLTOOL_DESKTOP_RULE@ DISTCLEANFILES = lxsession-edit.desktop #icondir = $(datadir)/share/icons/hicolor/128x128 #icon_DATA = pcmanfm.png uidir = $(datadir)/lxsession-edit # GtkBuilder UI definition files -ui_DATA = data/lxsession-edit.ui +ui_in_files = \ + data/lxsession-edit.glade + +ui_DATA = $(ui_in_files:.glade=.ui) EXTRA_DIST = \ autogen.sh \ lxsession-edit.desktop.in \ $(ui_DATA) +CLEANFILES = \ + $(ui_DATA) + all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -272,15 +226,15 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ - $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ + cd $(srcdir) && $(AUTOMAKE) --gnu \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -296,10 +250,9 @@ $(SHELL) ./config.status --recheck $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - $(am__cd) $(srcdir) && $(AUTOCONF) + cd $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -$(am__aclocal_m4_deps): + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.h: stamp-h1 @if test ! -f $@; then \ @@ -311,52 +264,48 @@ @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) + cd $(top_srcdir) && $(AUTOHEADER) rm -f stamp-h1 touch $@ distclean-hdr: -rm -f config.h stamp-h1 +lxsession-edit.desktop: $(top_builddir)/config.status $(srcdir)/lxsession-edit.desktop.in + cd $(top_builddir) && $(SHELL) ./config.status $@ install-desktopDATA: $(desktop_DATA) @$(NORMAL_INSTALL) test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" - @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ - for p in $$list; do \ + @list='$(desktop_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \ + f=$(am__strip_dir) \ + echo " $(desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopdir)/$$f'"; \ + $(desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \ done uninstall-desktopDATA: @$(NORMAL_UNINSTALL) - @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(desktopdir)" && rm -f $$files + @list='$(desktop_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \ + rm -f "$(DESTDIR)$(desktopdir)/$$f"; \ + done install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" - @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ - for p in $$list; do \ + @list='$(ui_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \ + f=$(am__strip_dir) \ + echo " $(uiDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(uidir)/$$f'"; \ + $(uiDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(uidir)/$$f"; \ done uninstall-uiDATA: @$(NORMAL_UNINSTALL) - @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(uidir)" && rm -f $$files + @list='$(ui_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(uidir)/$$f'"; \ + rm -f "$(DESTDIR)$(uidir)/$$f"; \ + done # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -365,7 +314,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ + @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -382,7 +331,7 @@ else \ local_target="$$target"; \ fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ @@ -390,7 +339,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ + @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -416,16 +365,16 @@ else \ local_target="$$target"; \ fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -440,7 +389,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - set x; \ + tags=; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -452,7 +401,7 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ @@ -461,41 +410,36 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) + tags=; \ 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; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique + $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) $(am__remove_distdir) - test -d "$(distdir)" || mkdir "$(distdir)" + test -d $(distdir) || mkdir $(distdir) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -511,55 +455,38 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ || exit 1; \ fi; \ done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ am__remove_distdir=: \ am__skip_length_check=: \ - am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ done - -test -n "$(am__skip_mode_fix)" \ - || find "$(distdir)" -type d ! -perm -755 \ - -exec chmod u+rwx,go+rx {} \; -o \ + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r "$(distdir)" + || chmod -R a+r $(distdir) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) @@ -572,10 +499,6 @@ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma $(am__remove_distdir) -dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) - dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -599,17 +522,15 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ - *.tar.xz*) \ - xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -617,11 +538,9 @@ mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) - test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ + && cd $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ @@ -643,15 +562,13 @@ && rm -rf "$$dc_destdir" \ && $(MAKE) $(AM_MAKEFLAGS) dist \ && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ - && cd "$$am__cwd" \ - || exit 1 + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ + @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ @@ -693,10 +610,10 @@ mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @@ -717,8 +634,6 @@ html: html-recursive -html-am: - info: info-recursive info-am: @@ -727,28 +642,18 @@ install-dvi: install-dvi-recursive -install-dvi-am: - install-exec-am: install-html: install-html-recursive -install-html-am: - install-info: install-info-recursive -install-info-am: - install-man: install-pdf: install-pdf-recursive -install-pdf-am: - install-ps: install-ps-recursive -install-ps-am: - installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -771,28 +676,30 @@ uninstall-am: uninstall-desktopDATA uninstall-uiDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \ - distclean distclean-generic distclean-hdr distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-desktopDATA 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 \ - install-uiDATA installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ - tags-recursive uninstall uninstall-am uninstall-desktopDATA \ - uninstall-uiDATA - -@INTLTOOL_DESKTOP_RULE@ - + dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-generic distclean-hdr distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ + install-desktopDATA 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 install-uiDATA \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-desktopDATA uninstall-uiDATA + + +# Generate GtkBuilder UI files from Glade files +%.ui: %.glade + $(GTK_BUILDER_CONVERT) $< $@ + $(top_builddir)/src/xml-purge $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru lxsession-edit-0.2.0/aclocal.m4 lxsession-edit-0.2.0~svn20090913/aclocal.m4 --- lxsession-edit-0.2.0/aclocal.m4 2011-07-19 20:18:15.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/aclocal.m4 2009-09-13 11:06:50.000000000 +0000 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.10.2 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 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. @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, +[m4_warning([this file was generated for autoconf 2.63. 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'.])]) @@ -301,7 +301,7 @@ dnl These rules are solely for the distribution goal. While doing this dnl we only have to keep exactly one list of the available catalogs - dnl in configure.ac. + dnl in configure.in. for lang in $ALL_LINGUAS; do GMOFILES="$GMOFILES $lang.gmo" POFILES="$POFILES $lang.po" @@ -430,7 +430,7 @@ dnl dnl Now the definitions that aclocal will find dnl -ifdef(glib_configure_ac,[],[ +ifdef(glib_configure_in,[],[ AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) ])dnl @@ -603,7 +603,7 @@ AC_DEFUN([IT_PO_SUBDIR], [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. dnl -dnl The following CONFIG_COMMANDS should be executed at the very end +dnl The following CONFIG_COMMANDS should be exetuted at the very end dnl of config.status. AC_CONFIG_COMMANDS_PRE([ AC_CONFIG_COMMANDS([$1/stamp-it], [ @@ -646,9 +646,8 @@ # AC_DEFUN([AC_PROG_INTLTOOL], ...) -# nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, -dnl Inc. +# nls.m4 serial 3 (gettext-0.15) +dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -666,21 +665,20 @@ dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. -AC_PREREQ([2.50]) +AC_PREREQ(2.50) AC_DEFUN([AM_NLS], [ AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS - AC_ARG_ENABLE([nls], + AC_ARG_ENABLE(nls, [ --disable-nls do not use Native Language Support], USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT([$USE_NLS]) - AC_SUBST([USE_NLS]) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) ]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) # # Copyright © 2004 Scott James Remnant . # @@ -708,10 +706,7 @@ AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) - +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi @@ -724,6 +719,7 @@ AC_MSG_RESULT([no]) PKG_CONFIG="" fi + fi[]dnl ])# PKG_PROG_PKG_CONFIG @@ -732,31 +728,34 @@ # Check to see whether a particular set of modules exists. Similar # to PKG_CHECK_MODULES(), but does not set variables or print errors. # -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually +# +# Similar to PKG_CHECK_MODULES, make sure that the first instance of +# this or PKG_CHECK_MODULES is called, or make sure to call +# PKG_CHECK_EXISTS manually # -------------------------------------------------------------- AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) + m4_ifval([$2], [$2], [:]) m4_ifvaln([$3], [else $3])dnl fi]) + # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - else - pkg_failed=untried +[if test -n "$PKG_CONFIG"; then + if test -n "$$1"; then + pkg_cv_[]$1="$$1" + else + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + fi +else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -798,17 +797,16 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - m4_default([$4], [AC_MSG_ERROR( + ifelse([$4], , [AC_MSG_ERROR(dnl [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -816,24 +814,25 @@ Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT])[]dnl - ]) +_PKG_TEXT +])], + [AC_MSG_RESULT([no]) + $4]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( + ifelse([$4], , [AC_MSG_FAILURE(dnl [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. _PKG_TEXT -To get pkg-config, see .])[]dnl - ]) +To get pkg-config, see .])], + [$4]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS $1[]_LIBS=$pkg_cv_[]$1[]_LIBS AC_MSG_RESULT([yes]) - $3 + ifelse([$3], , :, [$3]) fi[]dnl ])# PKG_CHECK_MODULES @@ -849,10 +848,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[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.11.1], [], +m4_if([$1], [1.10.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -868,7 +867,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.10.2])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -951,14 +950,14 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 # 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 9 +# serial 8 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -971,7 +970,6 @@ AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl _AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl if $2; then $1_TRUE= $1_FALSE='#' @@ -985,14 +983,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 # 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 10 +# serial 9 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -1049,16 +1047,6 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` fi - am__universal=false - m4_case([$1], [CC], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac], - [CXX], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac]) - for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -1076,17 +1064,7 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -1096,23 +1074,19 @@ break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; none) break ;; esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -1262,13 +1236,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 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 16 +# 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. @@ -1285,7 +1259,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.60])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -1336,8 +1310,8 @@ AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) -AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AM_PROG_INSTALL_SH +AM_PROG_INSTALL_STRIP AC_REQUIRE([AM_PROG_MKDIR_P])dnl # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -1345,37 +1319,24 @@ AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. -AC_CONFIG_COMMANDS_PRE(dnl -[m4_provide_if([_AM_COMPILER_EXEEXT], - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further -dnl mangled by Autoconf and run in a shell conditional statement. -m4_define([_AC_COMPILER_EXEEXT], -m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header @@ -1398,7 +1359,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1409,14 +1370,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} AC_SUBST(install_sh)]) # Copyright (C) 2003, 2005 Free Software Foundation, Inc. @@ -1443,38 +1397,27 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 # 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 5 +# serial 4 -# AM_MAINTAINER_MODE([DEFAULT-MODE]) -# ---------------------------------- -# Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user -# can override the default with the --enable/--disable switch. AC_DEFUN([AM_MAINTAINER_MODE], -[m4_case(m4_default([$1], [disable]), - [enable], [m4_define([am_maintainer_other], [disable])], - [disable], [m4_define([am_maintainer_other], [enable])], - [m4_define([am_maintainer_other], [enable]) - m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) - dnl maintainer-mode's default is 'disable' unless 'enable' is passed - AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST([MAINT])dnl + AC_SUBST(MAINT)dnl ] ) @@ -1482,13 +1425,13 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005 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 4 +# serial 3 # AM_MAKE_INCLUDE() # ----------------- @@ -1497,7 +1440,7 @@ [am_make=${MAKE-make} cat > confinc << 'END' am__doit: - @echo this is the am__doit target + @echo done .PHONY: am__doit END # If we don't find an include directive, just comment out the code. @@ -1507,24 +1450,24 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# In particular we don't look at `^make:' because GNU make might +# be invoked under some other name (usually "gmake"), in which +# case it prints its new name instead of `make'. +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then + am__include=include + am__quote= + _am_result=GNU +fi # Now try BSD make style include. if test "$am__include" = "#"; then echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote="\"" + _am_result=BSD + fi fi AC_SUBST([am__include]) AC_SUBST([am__quote]) @@ -1569,14 +1512,14 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 # 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 6 +# serial 5 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -1593,14 +1536,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" # Use eval to expand $SHELL if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " @@ -1671,14 +1607,14 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 # 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 5 +# serial 4 # AM_SANITY_CHECK # --------------- @@ -1687,29 +1623,16 @@ # Just in case sleep 1 echo timestamp > conftest.file -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[[\\\"\#\$\&\'\`$am_lf]]*) - AC_MSG_ERROR([unsafe absolute working directory name]);; -esac -case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; -esac - # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` if test "$[*]" = "X"; then # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` + set X `ls -t $srcdir/configure conftest.file` fi rm -f conftest.file if test "$[*]" != "X $srcdir/configure conftest.file" \ @@ -1734,33 +1657,6 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2009 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 1 - -# AM_SILENT_RULES([DEFAULT]) -# -------------------------- -# Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). -AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; -esac -AC_SUBST([AM_DEFAULT_VERBOSITY])dnl -AM_BACKSLASH='\' -AC_SUBST([AM_BACKSLASH])dnl -_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl -]) - # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -1789,25 +1685,18 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006 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 2 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) -# AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) - # Check how to create a tarball. -*- Autoconf -*- # Copyright (C) 2004, 2005 Free Software Foundation, Inc. diff -Nru lxsession-edit-0.2.0/compile lxsession-edit-0.2.0~svn20090913/compile --- lxsession-edit-0.2.0/compile 2011-07-19 20:18:17.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/compile 2009-09-13 11:06:51.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. -scriptversion=2009-10-06.20; # UTC +scriptversion=2005-05-14.22 -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software -# Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -18,7 +17,8 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# 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 @@ -103,13 +103,13 @@ fi # Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` +cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` # Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name +# Note: use `[/.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d while true; do if mkdir "$lockdir" >/dev/null 2>&1; then break @@ -124,9 +124,9 @@ ret=$? if test -f "$cofile"; then - test "$cofile" = "$ofile" || mv "$cofile" "$ofile" + mv "$cofile" "$ofile" elif test -f "${cofile}bj"; then - test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" + mv "${cofile}bj" "$ofile" fi rmdir "$lockdir" @@ -138,6 +138,5 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" +# time-stamp-end: "$" # End: diff -Nru lxsession-edit-0.2.0/config.h.in lxsession-edit-0.2.0~svn20090913/config.h.in --- lxsession-edit-0.2.0/config.h.in 2011-07-19 20:18:16.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/config.h.in 2009-09-13 11:06:51.000000000 +0000 @@ -66,9 +66,6 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME -/* Define to the home page for this package. */ -#undef PACKAGE_URL - /* Define to the version of this package. */ #undef PACKAGE_VERSION diff -Nru lxsession-edit-0.2.0/configure lxsession-edit-0.2.0~svn20090913/configure --- lxsession-edit-0.2.0/configure 2011-07-19 20:18:18.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/configure 2009-09-13 11:06:52.000000000 +0000 @@ -1,22 +1,18 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68. -# +# Generated by GNU Autoconf 2.63. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. -# -# +# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -24,15 +20,23 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; esac + fi + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + as_nl=' ' export as_nl @@ -40,13 +44,7 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -57,7 +55,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in #( + case $arg in *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -80,6 +78,13 @@ } fi +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -89,16 +94,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -as_myself= -case $0 in #(( +case $0 in *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break - done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done IFS=$as_save_IFS ;; @@ -110,16 +114,12 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 + { (exit 1); exit 1; } fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +# Work around bugs in pre-3.0 UWIN ksh. +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var done PS1='$ ' PS2='> ' @@ -131,306 +131,330 @@ LANGUAGE=C export LANGUAGE +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + # CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +$as_unset CDPATH + if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST + if (eval ":") 2>/dev/null; then + as_have_required=yes else - case \`(set -o) 2>/dev/null\` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac + as_have_required=no fi -" - as_required="as_fn_return () { (exit \$1); } -as_fn_success () { as_fn_return 0; } -as_fn_failure () { as_fn_return 1; } -as_fn_ret_success () { return 0; } -as_fn_ret_failure () { return 1; } + + if test $as_have_required = yes && (eval ": +(as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} exitcode=0 -as_fn_success || { exitcode=1; echo as_fn_success failed.; } -as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : - -else - exitcode=1; echo positional parameters were not saved. -fi -test x\$exitcode = x0 || exit 1" - as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO - as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO - eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && - test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -test \$(( 1 + 1 )) = 2 || exit 1" - if (eval "$as_required") 2>/dev/null; then : - as_have_required=yes +if as_func_success; then + : else - as_have_required=no + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : +if as_func_ret_success; then + : else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_found=false + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=\$LINENO + as_lineno_2=\$LINENO + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +") 2> /dev/null; then + : +else + as_candidate_shells= + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - as_found=: - case $as_dir in #( + case $as_dir in /*) for as_base in sh bash ksh sh5; do - # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : - CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : - break 2 -fi -fi + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" done;; esac - as_found=false done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } IFS=$as_save_IFS - if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} -fi + for as_shell in $as_candidate_shells $SHELL; do + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { ("$as_shell") 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." - else - $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, -$0: including any error possibly output before this -$0: message. Then install a modern shell, or manually run -$0: the script under such a shell if you do have one." - fi - exit 1 -fi fi + + +: +_ASEOF +}; then + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -SHELL=${CONFIG_SHELL-/bin/sh} -export SHELL -# Unset more variables known to interfere with behavior of common tools. -CLICOLOR_FORCE= GREP_OPTIONS= -unset CLICOLOR_FORCE GREP_OPTIONS -## --------------------- ## -## M4sh Shell Functions. ## -## --------------------- ## -# as_fn_unset VAR -# --------------- -# Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset - -# as_fn_set_status STATUS -# ----------------------- -# Set $? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} # as_fn_set_status - -# as_fn_exit STATUS -# ----------------- -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} # as_fn_exit - -# as_fn_mkdir_p -# ------------- -# Create "$as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" +: +(as_func_return () { + (exit $1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi -} # as_fn_mkdir_p -# as_fn_append VAR VALUE -# ---------------------- -# Append the text in VALUE to the end of the definition contained in VAR. Take -# advantage of any shell optimizations that allow amortized linear growth over -# repeated appends, instead of the typical quadratic growth present in naive -# implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : else - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append + exitcode=1 + echo as_func_ret_success failed. +fi -# as_fn_arith ARG... -# ------------------ -# Perform arithmetic evaluation on the ARGs, and store the result in the -# global $as_val. Take advantage of shells that can avoid forks. The arguments -# must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = "$1" ); then + : else - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith + exitcode=1 + echo positional parameters were not saved. +fi +test $exitcode = 0) || { (exit 1); exit 1; } -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. -as_fn_error () -{ - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi - $as_echo "$as_me: error: $2" >&2 - as_fn_exit $as_status -} # as_fn_error +( + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr +_ASEOF +}; then + break +fi + +fi + + done + + if test "x$CONFIG_SHELL" != x; then + for as_var in BASH_ENV ENV + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + + if test $as_have_required = no; then + echo This script requires a shell more modern than all the + echo shells that I found on your system. Please install a + echo modern shell, or manually run the script under such a + echo shell if you do have one. + { (exit 1); exit 1; } +fi + + +fi + +fi + + + +(eval "as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : else - as_expr=false + exitcode=1 + echo as_func_success failed. fi -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : else - as_basename=false + exitcode=1 + echo as_func_ret_success failed. fi -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : else - as_dirname=false + exitcode=1 + echo positional parameters were not saved. fi -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` +test \$exitcode = 0") || { + echo No shell found that supports shell functions. + echo Please tell bug-autoconf@gnu.org about your system, + echo including any error possibly output before this message. + echo This can help us improve future autoconf versions. + echo Configuration will now proceed without shell functions. +} -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_lineno_1=$LINENO as_lineno_1a=$LINENO - as_lineno_2=$LINENO as_lineno_2a=$LINENO - eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && - test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { - # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) sed -n ' p /[$]LINENO/= @@ -447,7 +471,8 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the @@ -457,18 +482,29 @@ exit } -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in #((((( --n*) - case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; - esac;; + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; *) ECHO_N='-n';; esac +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -498,7 +534,7 @@ rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' + as_mkdir_p=: else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -517,10 +553,10 @@ if test -d "$1"; then test -d "$1/."; else - case $1 in #( + case $1 in -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -534,11 +570,11 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -test -n "$DJDIR" || exec 7<&0 &1 + +exec 7<&0 &1 # Name of the host. -# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -553,6 +589,7 @@ subdirs= MFLAGS= MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME= @@ -560,7 +597,6 @@ PACKAGE_VERSION= PACKAGE_STRING= PACKAGE_BUGREPORT= -PACKAGE_URL= ac_unique_file="configure.in" # Factoring default headers for most tests. @@ -599,9 +635,7 @@ # include #endif" -ac_subst_vars='am__EXEEXT_FALSE -am__EXEEXT_TRUE -LTLIBOBJS +ac_subst_vars='LTLIBOBJS LIBOBJS MKINSTALLDIRS POSUB @@ -615,12 +649,10 @@ CATALOGS MSGFMT_OPTS GETTEXT_PACKAGE +GTK_BUILDER_CONVERT GTK_LIBS GTK_CFLAGS -PKG_CONFIG_LIBDIR -PKG_CONFIG_PATH PKG_CONFIG -ADDITIONAL_FLAGS EGREP GREP CPP @@ -673,8 +705,6 @@ MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE -AM_BACKSLASH -AM_DEFAULT_VERBOSITY am__untar am__tar AMTAR @@ -728,7 +758,6 @@ program_transform_name prefix exec_prefix -PACKAGE_URL PACKAGE_BUGREPORT PACKAGE_STRING PACKAGE_VERSION @@ -739,12 +768,9 @@ ac_subst_files='' ac_user_opts=' enable_option_checking -enable_silent_rules enable_maintainer_mode enable_nls enable_dependency_tracking -enable_more_warnings -enable_gtk3 ' ac_precious_vars='build_alias host_alias @@ -756,8 +782,6 @@ CPPFLAGS CPP PKG_CONFIG -PKG_CONFIG_PATH -PKG_CONFIG_LIBDIR GTK_CFLAGS GTK_LIBS' @@ -822,9 +846,8 @@ fi case $ac_option in - *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *=) ac_optarg= ;; - *) ac_optarg=yes ;; + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -869,7 +892,8 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -895,7 +919,8 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1099,7 +1124,8 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1115,7 +1141,8 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1145,17 +1172,17 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" + -*) { $as_echo "$as_me: error: unrecognized option: $ac_option +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - case $ac_envvar in #( - '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; - esac + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { (exit 1); exit 1; }; } eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1164,7 +1191,7 @@ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; esac @@ -1172,13 +1199,15 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error $? "missing argument to $ac_option" + { $as_echo "$as_me: error: missing argument to $ac_option" >&2 + { (exit 1); exit 1; }; } fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 + { (exit 1); exit 1; }; } ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1201,7 +1230,8 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" + { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } done # There might be people who depend on the old broken behavior: `$host' @@ -1215,8 +1245,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1231,9 +1261,11 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error $? "working directory cannot be determined" + { $as_echo "$as_me: error: working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error $? "pwd does not report name of working directory" + { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } # Find the source files, if location was not specified. @@ -1272,11 +1304,13 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" + { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { (exit 1); exit 1; }; } fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 + { (exit 1); exit 1; }; } pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1316,7 +1350,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages + -q, --quiet, --silent do not print \`checking...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1374,15 +1408,11 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0') --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer --disable-nls do not use Native Language Support --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors - --enable-more-warnings Add more warnings [default=no] - --enable-gtk3 enable to use gtk-3.0 instead of gtk-2.0 Some influential environment variables: CC C compiler command @@ -1390,21 +1420,16 @@ LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor PKG_CONFIG path to pkg-config utility - PKG_CONFIG_PATH - directories to add to pkg-config's search path - PKG_CONFIG_LIBDIR - path overriding pkg-config's built-in search path GTK_CFLAGS C compiler flags for GTK, overriding pkg-config GTK_LIBS linker flags for GTK, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to the package provider. _ACEOF ac_status=$? fi @@ -1468,372 +1493,21 @@ if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.68 +generated by GNU Autoconf 2.63 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit fi - -## ------------------------ ## -## Autoconf initialization. ## -## ------------------------ ## - -# ac_fn_c_try_compile LINENO -# -------------------------- -# Try to compile conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext - if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_compile - -# ac_fn_c_try_link LINENO -# ----------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_link () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_link - -# ac_fn_c_check_func LINENO FUNC VAR -# ---------------------------------- -# Tests whether FUNC exists, setting the cache variable VAR accordingly -ac_fn_c_check_func () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Define $2 to an innocuous variant, in case declares $2. - For example, HP-UX 11i declares gettimeofday. */ -#define $2 innocuous_$2 - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $2 - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $2 (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$2 || defined __stub___$2 -choke me -#endif - -int -main () -{ -return $2 (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_func - -# ac_fn_c_try_cpp LINENO -# ---------------------- -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_cpp - -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_run - -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_c_check_header_mongrel () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no -fi -rm -f conftest.err conftest.i conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_mongrel - -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -1869,8 +1543,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" - done + $as_echo "PATH: $as_dir" +done IFS=$as_save_IFS } >&5 @@ -1907,9 +1581,9 @@ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in - 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; 2) - as_fn_append ac_configure_args1 " '$ac_arg'" + ac_configure_args1="$ac_configure_args1 '$ac_arg'" if test $ac_must_keep_next = true; then ac_must_keep_next=false # Got value, back to normal. else @@ -1925,13 +1599,13 @@ -* ) ac_must_keep_next=true ;; esac fi - as_fn_append ac_configure_args " '$ac_arg'" + ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac done done -{ ac_configure_args0=; unset ac_configure_args0;} -{ ac_configure_args1=; unset ac_configure_args1;} +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there @@ -1943,9 +1617,11 @@ { echo - $as_echo "## ---------------- ## + cat <<\_ASBOX +## ---------------- ## ## Cache variables. ## -## ---------------- ##" +## ---------------- ## +_ASBOX echo # The following way of writing the cache mishandles newlines in values, ( @@ -1954,13 +1630,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; + *) $as_unset $ac_var ;; esac ;; esac done @@ -1979,9 +1655,11 @@ ) echo - $as_echo "## ----------------- ## + cat <<\_ASBOX +## ----------------- ## ## Output variables. ## -## ----------------- ##" +## ----------------- ## +_ASBOX echo for ac_var in $ac_subst_vars do @@ -1994,9 +1672,11 @@ echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + cat <<\_ASBOX +## ------------------- ## ## File substitutions. ## -## ------------------- ##" +## ------------------- ## +_ASBOX echo for ac_var in $ac_subst_files do @@ -2010,9 +1690,11 @@ fi if test -s confdefs.h; then - $as_echo "## ----------- ## + cat <<\_ASBOX +## ----------- ## ## confdefs.h. ## -## ----------- ##" +## ----------- ## +_ASBOX echo cat confdefs.h echo @@ -2026,39 +1708,37 @@ exit $exit_status ' 0 for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h -$as_echo "/* confdefs.h */" > confdefs.h - # Predefined preprocessor variables. cat >>confdefs.h <<_ACEOF #define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF + cat >>confdefs.h <<_ACEOF #define PACKAGE_TARNAME "$PACKAGE_TARNAME" _ACEOF + cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION "$PACKAGE_VERSION" _ACEOF + cat >>confdefs.h <<_ACEOF #define PACKAGE_STRING "$PACKAGE_STRING" _ACEOF -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" _ACEOF @@ -2067,12 +1747,7 @@ ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac + ac_site_file1=$CONFIG_SITE elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2083,23 +1758,19 @@ for ac_site_file in "$ac_site_file1" "$ac_site_file2" do test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 + if test -r "$ac_site_file"; then + { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } + . "$ac_site_file" fi done if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special files - # actually), so we avoid doing that. DJGPP emulates it as a regular file. - if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then + { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 $as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; @@ -2107,7 +1778,7 @@ esac fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 + { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 $as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -2122,11 +1793,11 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; @@ -2136,17 +1807,17 @@ ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 + { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 + { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 + { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 $as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 + { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac @@ -2158,20 +1829,35 @@ esac case " $ac_configure_args " in *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) as_fn_append ac_configure_args " '$ac_arg'" ;; + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 + { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { (exit 1); exit 1; }; } fi -## -------------------- ## -## Main body of script. ## -## -------------------- ## + + + + + + + + + + + + + + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -2180,7 +1866,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.11' +am__api_version='1.10' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2199,7 +1885,9 @@ fi done if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} + { (exit 1); exit 1; }; } fi # These three variables are undocumented and unsupported, @@ -2225,10 +1913,10 @@ # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : +if test "${ac_cv_path_install+set}" = set; then $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2236,11 +1924,11 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -2277,7 +1965,7 @@ ;; esac - done +done IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir @@ -2293,7 +1981,7 @@ INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 $as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2304,34 +1992,21 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 echo timestamp > conftest.file -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; -esac -case $srcdir in - *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; -esac - # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` if test "$*" = "X"; then # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` + set X `ls -t $srcdir/configure conftest.file` fi rm -f conftest.file if test "$*" != "X $srcdir/configure conftest.file" \ @@ -2341,8 +2016,11 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken +alias in your environment" >&5 +$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken +alias in your environment" >&2;} + { (exit 1); exit 1; }; } fi test "$2" = conftest.file @@ -2351,10 +2029,13 @@ # Ok. : else - as_fn_error $? "newly created file is older than distributed files! -Check your system clock" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! +Check your system clock" >&5 +$as_echo "$as_me: error: newly created file is older than distributed files! +Check your system clock" >&2;} + { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +{ $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" @@ -2369,144 +2050,28 @@ # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" # Use eval to expand $SHELL if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 + { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi - -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : +{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if test "${ac_cv_path_mkdir+set}" = set; then $as_echo_n "(cached) " >&6 else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 -$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } -if test -z "$MKDIR_P"; then - if ${ac_cv_path_mkdir+:} false; then : - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do + for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( @@ -2518,12 +2083,11 @@ esac done done - done +done IFS=$as_save_IFS fi - test -d ./--version && rmdir ./--version if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else @@ -2531,10 +2095,11 @@ # value for MKDIR_P within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the value is a relative name. + test -d ./--version && rmdir ./--version MKDIR_P="$ac_install_sh -d" fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } mkdir_p="$MKDIR_P" @@ -2547,9 +2112,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : +if test "${ac_cv_prog_AWK+set}" = set; then $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2560,24 +2125,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 + { $as_echo "$as_me:$LINENO: result: $AWK" >&5 $as_echo "$AWK" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi @@ -2585,11 +2150,11 @@ test -n "$AWK" && break done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2597,7 +2162,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2607,11 +2172,11 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2631,7 +2196,9 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} + { (exit 1); exit 1; }; } fi fi @@ -2675,6 +2242,108 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} + +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. @@ -2689,32 +2358,16 @@ ac_config_headers="$ac_config_headers config.h" -# Support silent build rules. Disable by either passing --disable-silent-rules -# to configure or passing V=1 to make -# Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : - enableval=$enable_silent_rules; -fi - -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=0;; -esac -AM_BACKSLASH='\' - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then : +if test "${enable_maintainer_mode+set}" = set; then enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval else USE_MAINTAINER_MODE=no fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 + { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 $as_echo "$USE_MAINTAINER_MODE" >&6; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= @@ -2730,16 +2383,16 @@ # Init intltool - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 + { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5 $as_echo_n "checking whether NLS is requested... " >&6; } # Check whether --enable-nls was given. -if test "${enable_nls+set}" = set; then : +if test "${enable_nls+set}" = set; then enableval=$enable_nls; USE_NLS=$enableval else USE_NLS=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 + { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5 $as_echo "$USE_NLS" >&6; } @@ -2751,44 +2404,44 @@ am_make=${MAKE-make} cat > confinc << 'END' am__doit: - @echo this is the am__doit target + @echo done .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 $as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# In particular we don't look at `^make:' because GNU make might +# be invoked under some other name (usually "gmake"), in which +# case it prints its new name instead of `make'. +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then + am__include=include + am__quote= + _am_result=GNU +fi # Now try BSD make style include. if test "$am__include" = "#"; then echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote="\"" + _am_result=BSD + fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 $as_echo "$_am_result" >&6; } rm -f confinc confmf # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then : +if test "${enable_dependency_tracking+set}" = set; then enableval=$enable_dependency_tracking; fi @@ -2813,9 +2466,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2826,24 +2479,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + { $as_echo "$as_me:$LINENO: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi @@ -2853,9 +2506,9 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2866,24 +2519,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi @@ -2892,7 +2545,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -2906,9 +2559,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2919,24 +2572,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + { $as_echo "$as_me:$LINENO: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi @@ -2946,9 +2599,9 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2960,18 +2613,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -2990,10 +2643,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + { $as_echo "$as_me:$LINENO: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi @@ -3005,9 +2658,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3018,24 +2671,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + { $as_echo "$as_me:$LINENO: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi @@ -3049,9 +2702,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3062,24 +2715,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi @@ -3092,7 +2745,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -3103,37 +2756,57 @@ fi -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" +{ (ac_try="$ac_compiler --version >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -3149,8 +2822,8 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } +{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: @@ -3166,17 +2839,17 @@ done rm -f $ac_rmfiles -if { { ac_try="$ac_link_default" +if { (ac_try="$ac_link_default" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -3193,7 +2866,7 @@ # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -3212,41 +2885,84 @@ else ac_file='' fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 + +{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +if test -z "$ac_file"; then + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: C compiler cannot create executables +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; }; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } + ac_exeext=$ac_cv_exeext +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +# If not cross compiling, check that we can run a simple program. +if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } + fi + fi +fi +{ $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 $as_echo_n "checking for suffix of executables... " >&6; } -if { { ac_try="$ac_link" +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -3261,85 +2977,34 @@ esac done else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } fi -rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 + +rm -f conftest$ac_cv_exeext +{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 $as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if test "${ac_cv_objext+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -int -main () -{ -FILE *f = fopen ("conftest.out", "w"); - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -ac_clean_files="$ac_clean_files conftest.out" -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -if test "$cross_compiling" != yes; then - { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if { ac_try='./conftest$ac_cv_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } - fi - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - + int main () { @@ -3349,17 +3014,17 @@ } _ACEOF rm -f conftest.o conftest.obj -if { { ac_try="$ac_compile" +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -3372,23 +3037,31 @@ $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } fi + rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 $as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : +if test "${ac_cv_c_compiler_gnu+set}" = set; then $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -3402,16 +3075,37 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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_compiler_gnu=yes else - ac_compiler_gnu=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes @@ -3420,16 +3114,20 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : +if test "${ac_cv_prog_cc_g+set}" = set; then $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -3440,11 +3138,35 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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_cv_prog_cc_g=yes else - CFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -3455,12 +3177,36 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 + : else - ac_c_werror_flag=$ac_save_c_werror_flag + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -3471,17 +3217,42 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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_cv_prog_cc_g=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -3498,14 +3269,18 @@ CFLAGS= fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : +if test "${ac_cv_prog_cc_c89+set}" = set; then $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include #include @@ -3562,9 +3337,32 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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_cv_prog_cc_c89=$ac_arg +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi + rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -3575,19 +3373,17 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 + { $as_echo "$as_me:$LINENO: result: none needed" >&5 $as_echo "none needed" >&6; } ;; xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 + { $as_echo "$as_me:$LINENO: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac -if test "x$ac_cv_prog_cc_c89" != xno; then : -fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3597,9 +3393,9 @@ depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -3625,11 +3421,6 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -3647,17 +3438,7 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -3667,23 +3448,19 @@ break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; none) break ;; esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -3707,7 +3484,7 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type @@ -3727,31 +3504,35 @@ case "$am__api_version" in 1.01234) - as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5 +$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;} + { (exit 1); exit 1; }; } ;; *) ;; esac if test -n ""; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= " >&5 + { $as_echo "$as_me:$LINENO: checking for intltool >= " >&5 $as_echo_n "checking for intltool >= ... " >&6; } INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 + { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - as_fn_error $? "Your intltool is too old. You need intltool or later." "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool or later." >&5 +$as_echo "$as_me: error: Your intltool is too old. You need intltool or later." >&2;} + { (exit 1); exit 1; }; } fi # Extract the first word of "intltool-update", so it can be a program name with args. set dummy intltool-update; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then : +if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then $as_echo_n "(cached) " >&6 else case $INTLTOOL_UPDATE in @@ -3764,14 +3545,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS ;; @@ -3779,19 +3560,19 @@ fi INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE if test -n "$INTLTOOL_UPDATE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 + { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5 $as_echo "$INTLTOOL_UPDATE" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "intltool-merge", so it can be a program name with args. set dummy intltool-merge; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_MERGE+:} false; then : +if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then $as_echo_n "(cached) " >&6 else case $INTLTOOL_MERGE in @@ -3804,14 +3585,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS ;; @@ -3819,19 +3600,19 @@ fi INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE if test -n "$INTLTOOL_MERGE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 + { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5 $as_echo "$INTLTOOL_MERGE" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "intltool-extract", so it can be a program name with args. set dummy intltool-extract; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then : +if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then $as_echo_n "(cached) " >&6 else case $INTLTOOL_EXTRACT in @@ -3844,14 +3625,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS ;; @@ -3859,16 +3640,18 @@ fi INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT if test -n "$INTLTOOL_EXTRACT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 + { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5 $as_echo "$INTLTOOL_EXTRACT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5 +$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;} + { (exit 1); exit 1; }; } fi INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -3990,9 +3773,9 @@ # Check the gettext tools to make sure they are GNU # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XGETTEXT+:} false; then : +if test "${ac_cv_path_XGETTEXT+set}" = set; then $as_echo_n "(cached) " >&6 else case $XGETTEXT in @@ -4005,14 +3788,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS ;; @@ -4020,19 +3803,19 @@ fi XGETTEXT=$ac_cv_path_XGETTEXT if test -n "$XGETTEXT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 + { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 $as_echo "$XGETTEXT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGMERGE+:} false; then : +if test "${ac_cv_path_MSGMERGE+set}" = set; then $as_echo_n "(cached) " >&6 else case $MSGMERGE in @@ -4045,14 +3828,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS ;; @@ -4060,19 +3843,19 @@ fi MSGMERGE=$ac_cv_path_MSGMERGE if test -n "$MSGMERGE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 + { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5 $as_echo "$MSGMERGE" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGFMT+:} false; then : +if test "${ac_cv_path_MSGFMT+set}" = set; then $as_echo_n "(cached) " >&6 else case $MSGFMT in @@ -4085,14 +3868,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS ;; @@ -4100,19 +3883,19 @@ fi MSGFMT=$ac_cv_path_MSGFMT if test -n "$MSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 + { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 $as_echo "$MSGFMT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GMSGFMT+:} false; then : +if test "${ac_cv_path_GMSGFMT+set}" = set; then $as_echo_n "(cached) " >&6 else case $GMSGFMT in @@ -4125,14 +3908,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" @@ -4141,29 +3924,33 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 + { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 $as_echo "$GMSGFMT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 +$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} + { (exit 1); exit 1; }; } fi xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 +$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} + { (exit 1); exit 1; }; } fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_PERL+:} false; then : +if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then $as_echo_n "(cached) " >&6 else case $INTLTOOL_PERL in @@ -4176,14 +3963,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS ;; @@ -4191,35 +3978,41 @@ fi INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL if test -n "$INTLTOOL_PERL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5 + { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 $as_echo "$INTLTOOL_PERL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi if test -z "$INTLTOOL_PERL"; then - as_fn_error $? "perl not found" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: perl not found" >&5 +$as_echo "$as_me: error: perl not found" >&2;} + { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 +{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5 $as_echo_n "checking for perl >= 5.8.1... " >&6; } $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 if test $? -ne 0; then - as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5 +$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;} + { (exit 1); exit 1; }; } else IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 + { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5 $as_echo "$IT_PERL_VERSION" >&6; } fi if test "x" != "xno-xml"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 + { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5 $as_echo_n "checking for XML::Parser... " >&6; } if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 + { $as_echo "$as_me:$LINENO: result: ok" >&5 $as_echo "ok" >&6; } else - as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5 +$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;} + { (exit 1); exit 1; }; } fi fi @@ -4229,7 +4022,11 @@ # Set DATADIRNAME correctly if it is not set yet # (copied from glib-gettext.m4) if test -z "$DATADIRNAME"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -4241,13 +4038,120 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then DATADIRNAME=share else - case $host in + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + case $host in *-*-solaris*) - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : + { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 +$as_echo_n "checking for bind_textdomain_codeset... " >&6; } +if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. + For example, HP-UX 11i declares gettimeofday. */ +#define bind_textdomain_codeset innocuous_bind_textdomain_codeset + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char bind_textdomain_codeset (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef bind_textdomain_codeset + +/* 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 bind_textdomain_codeset (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset +choke me +#endif + +int +main () +{ +return bind_textdomain_codeset (); + ; + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_func_bind_textdomain_codeset=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_bind_textdomain_codeset=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then DATADIRNAME=share else DATADIRNAME=lib @@ -4259,8 +4163,10 @@ ;; esac fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi @@ -4268,13 +4174,17 @@ -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 +{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5 $as_echo_n "checking for library containing strerror... " >&6; } -if ${ac_cv_search_strerror+:} false; then : +if test "${ac_cv_search_strerror+set}" = set; then $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +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. @@ -4299,27 +4209,54 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_search_strerror=$ac_res +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_strerror+:} false; then : + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_strerror+set}" = set; then break fi done -if ${ac_cv_search_strerror+:} false; then : - +if test "${ac_cv_search_strerror+set}" = set; then + : else ac_cv_search_strerror=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 $as_echo "$ac_cv_search_strerror" >&6; } ac_res=$ac_cv_search_strerror -if test "$ac_res" != no; then : +if test "$ac_res" != no; then test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi @@ -4332,9 +4269,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4345,24 +4282,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + { $as_echo "$as_me:$LINENO: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi @@ -4372,9 +4309,9 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -4385,24 +4322,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi @@ -4411,7 +4348,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -4425,9 +4362,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4438,24 +4375,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + { $as_echo "$as_me:$LINENO: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi @@ -4465,9 +4402,9 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4479,18 +4416,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -4509,10 +4446,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + { $as_echo "$as_me:$LINENO: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi @@ -4524,9 +4461,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4537,24 +4474,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + { $as_echo "$as_me:$LINENO: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi @@ -4568,9 +4505,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -4581,24 +4518,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi @@ -4611,7 +4548,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -4622,47 +4559,67 @@ fi -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" +{ (ac_try="$ac_compiler --version >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if test "${ac_cv_c_compiler_gnu+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ #ifndef __GNUC__ choke me #endif @@ -4671,16 +4628,37 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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_compiler_gnu=yes else - ac_compiler_gnu=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes @@ -4689,16 +4667,20 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : +if test "${ac_cv_prog_cc_g+set}" = set; then $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -4709,11 +4691,35 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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_cv_prog_cc_g=yes else - CFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -4724,12 +4730,36 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 + : else - ac_c_werror_flag=$ac_save_c_werror_flag + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -4740,17 +4770,42 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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_cv_prog_cc_g=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -4767,14 +4822,18 @@ CFLAGS= fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : +if test "${ac_cv_prog_cc_c89+set}" = set; then $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include #include @@ -4831,9 +4890,32 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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_cv_prog_cc_c89=$ac_arg +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi + rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -4844,19 +4926,17 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 + { $as_echo "$as_me:$LINENO: result: none needed" >&5 $as_echo "none needed" >&6; } ;; xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 + { $as_echo "$as_me:$LINENO: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac -if test "x$ac_cv_prog_cc_c89" != xno; then : -fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -4866,9 +4946,9 @@ depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -4894,11 +4974,6 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -4916,17 +4991,7 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -4936,23 +5001,19 @@ break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; none) break ;; esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -4976,7 +5037,7 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type @@ -4999,9 +5060,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -5012,24 +5073,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + { $as_echo "$as_me:$LINENO: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi @@ -5039,9 +5100,9 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -5052,24 +5113,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi @@ -5078,7 +5139,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -5092,9 +5153,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -5105,24 +5166,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + { $as_echo "$as_me:$LINENO: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi @@ -5132,9 +5193,9 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -5146,18 +5207,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -5176,10 +5237,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + { $as_echo "$as_me:$LINENO: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi @@ -5191,9 +5252,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -5204,24 +5265,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + { $as_echo "$as_me:$LINENO: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi @@ -5235,9 +5296,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -5248,24 +5309,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi @@ -5278,7 +5339,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -5289,42 +5350,62 @@ fi -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" +{ (ac_try="$ac_compiler --version >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : +if test "${ac_cv_c_compiler_gnu+set}" = set; then $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -5338,16 +5419,37 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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_compiler_gnu=yes else - ac_compiler_gnu=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes @@ -5356,16 +5458,20 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : +if test "${ac_cv_prog_cc_g+set}" = set; then $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -5376,11 +5482,35 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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_cv_prog_cc_g=yes else - CFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -5391,12 +5521,36 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 + : else - ac_c_werror_flag=$ac_save_c_werror_flag + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -5407,17 +5561,42 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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_cv_prog_cc_g=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -5434,14 +5613,18 @@ CFLAGS= fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : +if test "${ac_cv_prog_cc_c89+set}" = set; then $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include #include @@ -5498,9 +5681,32 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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_cv_prog_cc_c89=$ac_arg +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi + rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -5511,19 +5717,17 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 + { $as_echo "$as_me:$LINENO: result: none needed" >&5 $as_echo "none needed" >&6; } ;; xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 + { $as_echo "$as_me:$LINENO: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac -if test "x$ac_cv_prog_cc_c89" != xno; then : -fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -5533,9 +5737,9 @@ depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -5561,11 +5765,6 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -5583,17 +5782,7 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -5603,23 +5792,19 @@ break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; none) break ;; esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -5643,7 +5828,7 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type @@ -5662,18 +5847,22 @@ am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 + { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5 $as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 + { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5 $as_echo_n "checking whether cc understands -c and -o together... " >&6; } fi set dummy $CC; ac_cc=`$as_echo "$2" | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : +if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -5689,63 +5878,63 @@ # existing .o file with -o, though they will create one. ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' rm -f conftest2.* -if { { case "(($ac_try" in +if { (case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + test -f conftest2.$ac_objext && { (case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then eval ac_cv_prog_cc_${ac_cc}_c_o=yes if test "x$CC" != xcc; then # Test first that cc exists at all. if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in + { (case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' rm -f conftest2.* - if { { case "(($ac_try" in + if { (case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + test -f conftest2.$ac_objext && { (case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then # cc works too. : @@ -5762,13 +5951,15 @@ fi if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h +cat >>confdefs.h <<\_ACEOF +#define NO_MINUS_C_MINUS_O 1 +_ACEOF fi @@ -5792,14 +5983,14 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 $as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : + if test "${ac_cv_prog_CPP+set}" = set; then $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -5814,7 +6005,11 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #ifdef __STDC__ # include @@ -5823,34 +6018,78 @@ #endif Syntax error _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 + : else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.i conftest.$ac_ext + +rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 # Broken: success on invalid input. continue else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. ac_preproc_ok=: break fi -rm -f conftest.err conftest.i conftest.$ac_ext + +rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then break fi @@ -5862,7 +6101,7 @@ else ac_cv_prog_CPP=$CPP fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 $as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -5873,7 +6112,11 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #ifdef __STDC__ # include @@ -5882,40 +6125,87 @@ #endif Syntax error _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 + : else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.i conftest.$ac_ext + +rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 # Broken: success on invalid input. continue else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. ac_preproc_ok=: break fi -rm -f conftest.err conftest.i conftest.$ac_ext + +rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } +{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } fi ac_ext=c @@ -5925,9 +6215,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : +if test "${ac_cv_path_GREP+set}" = set; then $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -5938,7 +6228,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do + for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue @@ -5958,7 +6248,7 @@ $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val + ac_count=`expr $ac_count + 1` if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_GREP="$ac_path_GREP" @@ -5973,24 +6263,26 @@ $ac_path_GREP_found && break 3 done done - done +done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } fi else ac_cv_path_GREP=$GREP fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 $as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : +if test "${ac_cv_path_EGREP+set}" = set; then $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -6004,7 +6296,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do + for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue @@ -6024,7 +6316,7 @@ $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val + ac_count=`expr $ac_count + 1` if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_EGREP="$ac_path_EGREP" @@ -6039,10 +6331,12 @@ $ac_path_EGREP_found && break 3 done done - done +done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } fi else ac_cv_path_EGREP=$EGREP @@ -6050,17 +6344,21 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 $as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : +if test "${ac_cv_header_stdc+set}" = set; then $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include #include @@ -6075,23 +6373,48 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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_cv_header_stdc=yes else - ac_cv_header_stdc=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_stdc=no fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - + $EGREP "memchr" >/dev/null 2>&1; then + : else ac_cv_header_stdc=no fi @@ -6101,14 +6424,18 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - + $EGREP "free" >/dev/null 2>&1; then + : else ac_cv_header_stdc=no fi @@ -6118,10 +6445,14 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes; then : else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include #include @@ -6148,69 +6479,65 @@ return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +( exit $ac_status ) +ac_cv_header_stdc=no fi - - -# Check whether --enable-more_warnings was given. -if test "${enable_more_warnings+set}" = set; then : - enableval=$enable_more_warnings; enable_more_warnings="${enableval}" -else - enable_more_warnings=no - +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -if test x"$enable_more_warnings" = x"yes"; then - ADDITIONAL_FLAGS="-Wall -Werror=all -Werror=format -Werror=implicit-function-declaration -Werror=implicit-int -Werror=missing-braces -Werror=parentheses -Werror=return-type -Werror=strict-aliasing -Werror=switch -Wuninitialized -Werror=unused-label -Werror=unused-value -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Werror=missing-declarations -Wredundant-decls -Wmissing-noreturn -Wpointer-arith -Wcast-align -Wwrite-strings -Werror=inline -Werror=format-nonliteral -Wformat-nonliteral -Werror=format-security -Wformat-security -Winit-self -Werror=missing-include-dirs -Werror=undef -Werror=aggregate-return -Wmissing-format-attribute -Werror=nested-externs -fno-strict-aliasing -fmessage-length=0 -Wp,-D_FORTIFY_SOURCE=2 -DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES" fi - - -# Check whether --enable-gtk3 was given. -if test "${enable_gtk3+set}" = set; then : - enableval=$enable_gtk3; case "${enableval}" in - yes) enable_gtk3=yes ;; - no) enable_gtk3=no ;; - *) as_fn_error $? "bad value \"${enableval}\" for --enable-gtk3, use \"yes\" (default) or \"no\"." "$LINENO" 5 ;; -esac fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then +cat >>confdefs.h <<\_ACEOF +#define STDC_HEADERS 1 +_ACEOF -if test "x$enable_gtk3" = "xyes" ; then - CFLAGS="$CFLAGS -DENABLE_GTK3" - gtk_modules="gtk+-3.0 >= 3.0.0" -else - gtk_modules="gtk+-2.0 >= 2.12.0" fi - - +gtk_modules="gtk+-2.0 >= 2.12.0" if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -6223,14 +6550,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS ;; @@ -6238,10 +6565,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 $as_echo "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi @@ -6251,9 +6578,9 @@ ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -6266,14 +6593,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS ;; @@ -6281,10 +6608,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 + { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 $as_echo "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi @@ -6293,7 +6620,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -6306,60 +6633,63 @@ fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 + { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } PKG_CONFIG="" fi + fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 +{ $as_echo "$as_me:$LINENO: checking for GTK" >&5 $as_echo_n "checking for GTK... " >&6; } -if test -n "$GTK_CFLAGS"; then - pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_modules\""; } >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$GTK_CFLAGS"; then + pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gtk_modules\"") >&5 ($PKG_CONFIG --exists --print-errors "$gtk_modules") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "$gtk_modules" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$GTK_LIBS"; then - pkg_cv_GTK_LIBS="$GTK_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_modules\""; } >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$GTK_LIBS"; then + pkg_cv_GTK_LIBS="$GTK_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gtk_modules\"") >&5 ($PKG_CONFIG --exists --print-errors "$gtk_modules") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "$gtk_modules" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -6367,14 +6697,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$gtk_modules" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gtk_modules"` else - GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "$gtk_modules" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gtk_modules"` fi # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements ($gtk_modules) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements ($gtk_modules) were not met: $GTK_PKG_ERRORS @@ -6383,13 +6713,34 @@ Alternatively, you may set the environment variables GTK_CFLAGS and GTK_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 +See the pkg-config man page for more details. +" >&5 +$as_echo "$as_me: error: Package requirements ($gtk_modules) were not met: + +$GTK_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GTK_CFLAGS +and GTK_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&2;} + { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GTK_CFLAGS +and GTK_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -6398,16 +6749,65 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } else GTK_CFLAGS=$pkg_cv_GTK_CFLAGS GTK_LIBS=$pkg_cv_GTK_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } + : +fi + + + +# Gtk Builder +# Extract the first word of "gtk-builder-convert", so it can be a program name with args. +set dummy gtk-builder-convert; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GTK_BUILDER_CONVERT+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $GTK_BUILDER_CONVERT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GTK_BUILDER_CONVERT="$GTK_BUILDER_CONVERT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GTK_BUILDER_CONVERT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + test -z "$ac_cv_path_GTK_BUILDER_CONVERT" && ac_cv_path_GTK_BUILDER_CONVERT="false" + ;; +esac +fi +GTK_BUILDER_CONVERT=$ac_cv_path_GTK_BUILDER_CONVERT +if test -n "$GTK_BUILDER_CONVERT"; then + { $as_echo "$as_me:$LINENO: result: $GTK_BUILDER_CONVERT" >&5 +$as_echo "$GTK_BUILDER_CONVERT" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi +if test "$GTK_BUILDER_CONVERT" = "false"; then + { { $as_echo "$as_me:$LINENO: error: gtk-builder-convert not found" >&5 +$as_echo "$as_me: error: gtk-builder-convert not found" >&2;} + { (exit 1); exit 1; }; } +fi GETTEXT_PACKAGE=lxsession-edit @@ -6417,24 +6817,71 @@ _ACEOF -# Generate po/LINGUAS on the fly rather than relying on translators -# to maintain it manually. This also overcome the problem that Transifex -# cannot add a language to po/LINGUAS if a new po file is submitted. -rm -f $srcdir/po/LINGUAS -for po_file in `ls $srcdir/po/*.po | sort`; -do - lang=`echo "$po_file" | sed "s|.*/po/\(.*\)\.po|\1|g"` - echo $lang >> $srcdir/po/LINGUAS -done - +ALL_LINGUAS="af ar cs da de es et eu fa fi fr gl hr hu id it ja ko lt ml ms nb nl nn pl ps pt pt_BR ru sk sl sv tr uk ur ur_PK vi zh_CN zh_TW" # On IRIX 5.3, sys/types and inttypes.h are conflicting. + + + + + + + + + for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 + eval "$as_ac_Header=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Header=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -6445,12 +6892,146 @@ - for ac_header in locale.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" -if test "x$ac_cv_header_locale_h" = xyes; then : + +for ac_header in locale.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 + $as_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 +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 + $as_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 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + +fi +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_LOCALE_H 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -6458,12 +7039,16 @@ done if test $ac_cv_header_locale_h = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 + { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 $as_echo_n "checking for LC_MESSAGES... " >&6; } -if ${am_cv_val_LC_MESSAGES+:} false; then : +if test "${am_cv_val_LC_MESSAGES+set}" = set; then $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include int @@ -6474,19 +7059,46 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then am_cv_val_LC_MESSAGES=yes else - am_cv_val_LC_MESSAGES=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + am_cv_val_LC_MESSAGES=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 +{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 $as_echo "$am_cv_val_LC_MESSAGES" >&6; } if test $am_cv_val_LC_MESSAGES = yes; then -$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h +cat >>confdefs.h <<\_ACEOF +#define HAVE_LC_MESSAGES 1 +_ACEOF fi fi @@ -6499,20 +7111,150 @@ XGETTEXT=: INTLLIBS= - ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" -if test "x$ac_cv_header_libintl_h" = xyes; then : + if test "${ac_cv_header_libintl_h+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 +$as_echo_n "checking for libintl.h... " >&6; } +if test "${ac_cv_header_libintl_h+set}" = set; then + $as_echo_n "(cached) " >&6 +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +$as_echo "$ac_cv_header_libintl_h" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5 +$as_echo_n "checking libintl.h usability... " >&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 +_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 + $as_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 +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5 +$as_echo_n "checking libintl.h presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 + $as_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 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 +$as_echo_n "checking for libintl.h... " >&6; } +if test "${ac_cv_header_libintl_h+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_header_libintl_h=$ac_header_preproc +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +$as_echo "$ac_cv_header_libintl_h" >&6; } + +fi +if test "x$ac_cv_header_libintl_h" = x""yes; then gt_cv_func_dgettext_libintl="no" libintl_extra_libs="" # # First check in libc # - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 + { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5 $as_echo_n "checking for ngettext in libc... " >&6; } -if ${gt_cv_func_ngettext_libc+:} false; then : +if test "${gt_cv_func_ngettext_libc+set}" = set; then $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include @@ -6525,25 +7267,54 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then gt_cv_func_ngettext_libc=yes else - gt_cv_func_ngettext_libc=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + gt_cv_func_ngettext_libc=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5 +{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 $as_echo "$gt_cv_func_ngettext_libc" >&6; } if test "$gt_cv_func_ngettext_libc" = "yes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 + { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5 $as_echo_n "checking for dgettext in libc... " >&6; } -if ${gt_cv_func_dgettext_libc+:} false; then : +if test "${gt_cv_func_dgettext_libc+set}" = set; then $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include @@ -6551,31 +7322,146 @@ int main () { -return !dgettext ("","") +return !dgettext ("","") + ; + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + gt_cv_func_dgettext_libc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + gt_cv_func_dgettext_libc=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 +$as_echo "$gt_cv_func_dgettext_libc" >&6; } + fi + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + +for ac_func in bind_textdomain_codeset +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* 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 $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_dgettext_libc=yes +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" else - gt_cv_func_dgettext_libc=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5 -$as_echo "$gt_cv_func_dgettext_libc" >&6; } - fi - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - for ac_func in bind_textdomain_codeset -do : - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_BIND_TEXTDOMAIN_CODESET 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi @@ -6590,14 +7476,18 @@ || test "$gt_cv_func_ngettext_libc" != "yes" \ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 + { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 $as_echo_n "checking for bindtextdomain in -lintl... " >&6; } -if ${ac_cv_lib_intl_bindtextdomain+:} false; then : +if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +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. @@ -6615,26 +7505,55 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_intl_bindtextdomain=yes else - ac_cv_lib_intl_bindtextdomain=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_intl_bindtextdomain=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } -if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 +if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then + { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 $as_echo_n "checking for ngettext in -lintl... " >&6; } -if ${ac_cv_lib_intl_ngettext+:} false; then : +if test "${ac_cv_lib_intl_ngettext+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +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. @@ -6652,26 +7571,55 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_intl_ngettext=yes else - ac_cv_lib_intl_ngettext=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_intl_ngettext=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 $as_echo "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 +if test "x$ac_cv_lib_intl_ngettext" = x""yes; then + { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 $as_echo_n "checking for dgettext in -lintl... " >&6; } -if ${ac_cv_lib_intl_dgettext+:} false; then : +if test "${ac_cv_lib_intl_dgettext+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +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. @@ -6689,18 +7637,43 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_intl_dgettext=yes else - ac_cv_lib_intl_dgettext=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_intl_dgettext=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 $as_echo "$ac_cv_lib_intl_dgettext" >&6; } -if test "x$ac_cv_lib_intl_dgettext" = xyes; then : +if test "x$ac_cv_lib_intl_dgettext" = x""yes; then gt_cv_func_dgettext_libintl=yes fi @@ -6710,18 +7683,22 @@ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5 + { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 $as_echo_n "checking if -liconv is needed to use gettext... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 + { $as_echo "$as_me:$LINENO: result: " >&5 $as_echo "" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 + { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 $as_echo_n "checking for ngettext in -lintl... " >&6; } -if ${ac_cv_lib_intl_ngettext+:} false; then : +if test "${ac_cv_lib_intl_ngettext+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +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. @@ -6739,26 +7716,55 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_intl_ngettext=yes else - ac_cv_lib_intl_ngettext=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_intl_ngettext=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 $as_echo "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 +if test "x$ac_cv_lib_intl_ngettext" = x""yes; then + { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 $as_echo_n "checking for dcgettext in -lintl... " >&6; } -if ${ac_cv_lib_intl_dcgettext+:} false; then : +if test "${ac_cv_lib_intl_dcgettext+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +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. @@ -6776,18 +7782,43 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_intl_dcgettext=yes else - ac_cv_lib_intl_dcgettext=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_intl_dcgettext=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 $as_echo "$ac_cv_lib_intl_dcgettext" >&6; } -if test "x$ac_cv_lib_intl_dcgettext" = xyes; then : +if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then gt_cv_func_dgettext_libintl=yes libintl_extra_libs=-liconv else @@ -6809,12 +7840,102 @@ glib_save_LIBS="$LIBS" LIBS="$LIBS -lintl $libintl_extra_libs" unset ac_cv_func_bind_textdomain_codeset - for ac_func in bind_textdomain_codeset -do : - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : + +for ac_func in bind_textdomain_codeset +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* 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 $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_BIND_TEXTDOMAIN_CODESET 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi @@ -6844,13 +7965,15 @@ if test "$gt_cv_have_gettext" = "yes"; then -$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h +cat >>confdefs.h <<\_ACEOF +#define HAVE_GETTEXT 1 +_ACEOF # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGFMT+:} false; then : +if test "${ac_cv_path_MSGFMT+set}" = set; then $as_echo_n "(cached) " >&6 else case "$MSGFMT" in @@ -6875,28 +7998,118 @@ fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 + { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 $as_echo "$MSGFMT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi if test "$MSGFMT" != "no"; then glib_save_LIBS="$LIBS" LIBS="$LIBS $INTLLIBS" - for ac_func in dcgettext -do : - ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" -if test "x$ac_cv_func_dcgettext" = xyes; then : + +for ac_func in dcgettext +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* 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 $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_DCGETTEXT 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi done MSGFMT_OPTS= - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5 + { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 $as_echo_n "checking if msgfmt accepts -c... " >&6; } cat >conftest.foo <<_ACEOF @@ -6911,14 +8124,14 @@ "Content-Transfer-Encoding: 8bit\n" _ACEOF -if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5 +if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5 ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } -else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } echo "$as_me: failed input was:" >&5 sed 's/^/| /' conftest.foo >&5 @@ -6926,9 +8139,9 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GMSGFMT+:} false; then : +if test "${ac_cv_path_GMSGFMT+set}" = set; then $as_echo_n "(cached) " >&6 else case $GMSGFMT in @@ -6941,14 +8154,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" @@ -6957,19 +8170,19 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 + { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 $as_echo "$GMSGFMT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XGETTEXT+:} false; then : +if test "${ac_cv_path_XGETTEXT+set}" = set; then $as_echo_n "(cached) " >&6 else case "$XGETTEXT" in @@ -6994,33 +8207,144 @@ fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 + { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 $as_echo "$XGETTEXT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr + ; + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + CATOBJEXT=.gmo + DATADIRNAME=share +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + case $host in + *-*-solaris*) + { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 +$as_echo_n "checking for bind_textdomain_codeset... " >&6; } +if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. + For example, HP-UX 11i declares gettimeofday. */ +#define bind_textdomain_codeset innocuous_bind_textdomain_codeset + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char bind_textdomain_codeset (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef bind_textdomain_codeset + +/* 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 bind_textdomain_codeset (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset +choke me +#endif int main () { -extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr +return bind_textdomain_codeset (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - CATOBJEXT=.gmo - DATADIRNAME=share +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_func_bind_textdomain_codeset=yes else - case $host in - *-*-solaris*) - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_bind_textdomain_codeset=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then CATOBJEXT=.gmo DATADIRNAME=share else @@ -7035,8 +8359,10 @@ ;; esac fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS="$glib_save_LIBS" INSTOBJEXT=.mo else @@ -7050,7 +8376,9 @@ if test "$gt_cv_have_gettext" = "yes" ; then -$as_echo "#define ENABLE_NLS 1" >>confdefs.h +cat >>confdefs.h <<\_ACEOF +#define ENABLE_NLS 1 +_ACEOF fi @@ -7058,7 +8386,7 @@ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 + { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } XGETTEXT=":" fi @@ -7091,7 +8419,7 @@ if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 + { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 $as_echo_n "checking for catalogs to be installed... " >&6; } NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do @@ -7116,7 +8444,7 @@ fi done LINGUAS=$NEW_LINGUAS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 + { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5 $as_echo "$LINGUAS" >&6; } fi @@ -7149,7 +8477,7 @@ < $srcdir/po/POTFILES.in > po/POTFILES -ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile.in" +ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile.in lxsession-edit.desktop" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -7178,13 +8506,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; + *) $as_unset $ac_var ;; esac ;; esac done @@ -7192,8 +8520,8 @@ (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes: double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \. + # `set' does not quote correctly, so add quotes (double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" @@ -7215,23 +8543,12 @@ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 + test "x$cache_file" != "x/dev/null" && + { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - if test ! -f "$cache_file" || test -h "$cache_file"; then - cat confcache >"$cache_file" - else - case $cache_file in #( - */* | ?:*) - mv -f confcache "$cache_file"$$ && - mv -f "$cache_file"$$ "$cache_file" ;; #( - *) - mv -f confcache "$cache_file" ;; - esac - fi - fi + cat confcache >$cache_file else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 + { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi @@ -7245,62 +8562,67 @@ ac_libobjs= ac_ltlibobjs= -U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. - as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" - as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs - if test -n "$EXEEXT"; then - am__EXEEXT_TRUE= - am__EXEEXT_FALSE='#' -else - am__EXEEXT_TRUE='#' - am__EXEEXT_FALSE= -fi - if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error $? "conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } fi ac_config_commands="$ac_config_commands po/stamp-it" if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } fi -: "${CONFIG_STATUS=./config.status}" +: ${CONFIG_STATUS=./config.status} ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -as_write_fail=0 -cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 +cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -7310,18 +8632,17 @@ debug=false ac_cs_recheck=false ac_cs_silent=false - SHELL=\${CONFIG_SHELL-$SHELL} -export SHELL -_ASEOF -cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -7329,15 +8650,23 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; esac + fi + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + as_nl=' ' export as_nl @@ -7345,13 +8674,7 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -7362,7 +8685,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in #( + case $arg in *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -7385,6 +8708,13 @@ } fi +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -7394,16 +8724,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -as_myself= -case $0 in #(( +case $0 in *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break - done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done IFS=$as_save_IFS ;; @@ -7415,16 +8744,12 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 + { (exit 1); exit 1; } fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +# Work around bugs in pre-3.0 UWIN ksh. +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var done PS1='$ ' PS2='> ' @@ -7436,89 +8761,7 @@ LANGUAGE=C export LANGUAGE -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. -as_fn_error () -{ - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi - $as_echo "$as_me: error: $2" >&2 - as_fn_exit $as_status -} # as_fn_error - - -# as_fn_set_status STATUS -# ----------------------- -# Set $? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} # as_fn_set_status - -# as_fn_exit STATUS -# ----------------- -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} # as_fn_exit - -# as_fn_unset VAR -# --------------- -# Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset -# as_fn_append VAR VALUE -# ---------------------- -# Append the text in VALUE to the end of the definition contained in VAR. Take -# advantage of any shell optimizations that allow amortized linear growth over -# repeated appends, instead of the typical quadratic growth present in naive -# implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' -else - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append - -# as_fn_arith ARG... -# ------------------ -# Perform arithmetic evaluation on the ARGs, and store the result in the -# global $as_val. Take advantage of shells that can avoid forks. The arguments -# must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' -else - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith - - +# Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -7532,12 +8775,8 @@ as_basename=false fi -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi +# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ @@ -7557,25 +8796,76 @@ } s/.*/./; q'` -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits +# CDPATH. +$as_unset CDPATH + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in #((((( +case `echo -n x` in -n*) - case `echo 'xy\c'` in + case `echo 'x\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; + *) ECHO_C='\c';; esac;; *) ECHO_N='-n';; esac +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -7604,56 +8894,8 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null - -# as_fn_mkdir_p -# ------------- -# Create "$as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ - - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - - -} # as_fn_mkdir_p if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' + as_mkdir_p=: else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -7672,10 +8914,10 @@ if test -d "$1"; then test -d "$1/."; else - case $1 in #( + case $1 in -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -7690,19 +8932,13 @@ exec 6>&1 -## ----------------------------------- ## -## Main body of $CONFIG_STATUS script. ## -## ----------------------------------- ## -_ASEOF -test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# Save the log message, to keep $0 and so on meaningful, and to +# Save the log message, to keep $[0] and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -7734,15 +8970,13 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files and other configuration actions -from templates according to the current configuration. Unless the files -and actions are specified as TAGs, all are instantiated by default. +\`$as_me' instantiates files from templates according to the +current configuration. -Usage: $0 [OPTION]... [TAG]... +Usage: $0 [OPTION]... [FILE]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit - --config print configuration, then exit -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files @@ -7761,17 +8995,16 @@ Configuration commands: $config_commands -Report bugs to the package provider." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.68, - with options \\"\$ac_cs_config\\" +configured by $0, generated by GNU Autoconf 2.63, + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2008 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -7789,16 +9022,11 @@ while test $# != 0 do case $1 in - --*=?*) + --*=*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; - --*=) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg= - ac_shift=: - ;; *) ac_option=$1 ac_optarg=$2 @@ -7812,29 +9040,27 @@ ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) $as_echo "$ac_cs_version"; exit ;; - --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - '') as_fn_error $? "missing file argument" ;; esac - as_fn_append CONFIG_FILES " '$ac_optarg'" + CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" ac_need_defaults=false;; --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - as_fn_append CONFIG_HEADERS " '$ac_optarg'" + CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error $? "ambiguous option: \`$1' -Try \`$0 --help' for more information.";; + { $as_echo "$as_me: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; };; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ @@ -7842,10 +9068,11 @@ ac_cs_silent=: ;; # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' -Try \`$0 --help' for more information." ;; + -*) { $as_echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; - *) as_fn_append ac_config_targets " $1" + *) ac_config_targets="$ac_config_targets $1" ac_need_defaults=false ;; esac @@ -7903,9 +9130,12 @@ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; + "lxsession-edit.desktop") CONFIG_FILES="$CONFIG_FILES lxsession-edit.desktop" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; esac done @@ -7928,24 +9158,26 @@ # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= ac_tmp= + tmp= trap 'exit_status=$? - : "${ac_tmp:=$tmp}" - { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 - trap 'as_fn_exit 1' 1 2 13 15 + trap '{ (exit 1); exit 1; }' 1 2 13 15 } # Create a (secure) tmp directory for tmp files. { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -d "$tmp" + test -n "$tmp" && test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -ac_tmp=$tmp +} || +{ + $as_echo "$as_me: cannot create a temporary directory in ." >&2 + { (exit 1); exit 1; } +} # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -7953,13 +9185,7 @@ if test -n "$CONFIG_FILES"; then -ac_cr=`echo X | tr X '\015'` -# On cygwin, bash can eat \r inside `` if the user requested igncr. -# But we know of no other shell where ac_cr would be empty at this -# point, so we can use a bashism as a fallback. -if test "x$ac_cr" = x; then - eval ac_cr=\$\'\\r\' -fi +ac_cr=' ' ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then ac_cs_awk_cr='\\r' @@ -7967,7 +9193,7 @@ ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +echo 'BEGIN {' >"$tmp/subs1.awk" && _ACEOF @@ -7976,18 +9202,24 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -7995,7 +9227,7 @@ rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -8009,7 +9241,7 @@ t delim :nl h -s/\(.\{148\}\)..*/\1/ +s/\(.\{148\}\).*/\1/ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p @@ -8023,7 +9255,7 @@ t nl :delim h -s/\(.\{148\}\)..*/\1/ +s/\(.\{148\}\).*/\1/ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p @@ -8043,7 +9275,7 @@ rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && +cat >>"\$tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -8075,29 +9307,23 @@ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ - || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ + || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 +$as_echo "$as_me: error: could not setup config files machinery" >&2;} + { (exit 1); exit 1; }; } _ACEOF -# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -h -s/// -s/^/:/ -s/[ ]*$/:/ -s/:\$(srcdir):/:/g -s/:\${srcdir}:/:/g -s/:@srcdir@:/:/g -s/^:*// + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/ +s/:*\${srcdir}:*/:/ +s/:*@srcdir@:*/:/ +s/^\([^=]*=[ ]*\):*/\1/ s/:*$// -x -s/\(=[ ]*\).*/\1/ -G -s/\n// s/^[^=]*=[ ]*$// }' fi @@ -8109,7 +9335,7 @@ # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then -cat >"$ac_tmp/defines.awk" <<\_ACAWK || +cat >"$tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -8121,11 +9347,13 @@ # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_tt=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_tt"; then + ac_t=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_t"; then break elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} + { (exit 1); exit 1; }; } else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -8210,7 +9438,9 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 +$as_echo "$as_me: error: could not setup config headers machinery" >&2;} + { (exit 1); exit 1; }; } fi # test -n "$CONFIG_HEADERS" @@ -8223,7 +9453,9 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 +$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} + { (exit 1); exit 1; }; };; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -8242,7 +9474,7 @@ for ac_f do case $ac_f in - -) ac_f="$ac_tmp/stdin";; + -) ac_f="$tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -8251,10 +9483,12 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { (exit 1); exit 1; }; };; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - as_fn_append ac_file_inputs " '$ac_f'" + ac_file_inputs="$ac_file_inputs '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't @@ -8265,7 +9499,7 @@ `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 + { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 $as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. @@ -8277,8 +9511,10 @@ esac case $ac_tag in - *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$tmp/stdin" \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } ;; esac ;; esac @@ -8306,7 +9542,47 @@ q } s/.*/./; q'` - as_dir="$ac_dir"; as_fn_mkdir_p + { as_dir="$ac_dir" + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} + { (exit 1); exit 1; }; }; } ac_builddir=. case "$ac_dir" in @@ -8363,6 +9639,7 @@ # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= + ac_sed_dataroot=' /datarootdir/ { p @@ -8372,11 +9649,12 @@ /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/p' +/@mandir@/p +' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 + { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -8386,7 +9664,7 @@ s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; + s&\\\${datarootdir}&$datarootdir&g' ;; esac _ACEOF @@ -8414,24 +9692,27 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ - >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ - "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&5 + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&2;} +which seems to be undefined. Please make sure it is defined." >&2;} - rm -f "$ac_tmp/stdin" + rm -f "$tmp/stdin" case $ac_file in - -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; - *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } ;; :H) # @@ -8440,21 +9721,27 @@ if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" - } >"$ac_tmp/config.h" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" - mv "$ac_tmp/config.h" "$ac_file" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + mv "$tmp/config.h" "$ac_file" \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } fi else $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error $? "could not create -" "$LINENO" 5 + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 +$as_echo "$as_me: error: could not create -" >&2;} + { (exit 1); exit 1; }; } fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -8492,7 +9779,7 @@ s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 + :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 $as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -8587,7 +9874,47 @@ q } s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p + { as_dir=$dirpart/$fdir + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} + { (exit 1); exit 1; }; }; } # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done @@ -8599,7 +9926,9 @@ esac ;; "po/stamp-it":C) if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then - as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5 +$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;} + { (exit 1); exit 1; }; } fi rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" >"po/stamp-it.tmp" @@ -8622,12 +9951,15 @@ done # for ac_tag -as_fn_exit 0 +{ (exit 0); exit 0; } _ACEOF +chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } # configure is writing to config.log, and then calls config.status. @@ -8648,10 +9980,10 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit 1 + $ac_cs_success || { (exit 1); exit 1; } fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi diff -Nru lxsession-edit-0.2.0/configure.in lxsession-edit-0.2.0~svn20090913/configure.in --- lxsession-edit-0.2.0/configure.in 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/configure.in 2009-09-05 21:29:07.000000000 +0000 @@ -3,10 +3,6 @@ AC_INIT(configure.in) AM_INIT_AUTOMAKE(lxsession-edit, 0.2.0) AM_CONFIG_HEADER(config.h) -# Support silent build rules. Disable by either passing --disable-silent-rules -# to configure or passing V=1 to make -AM_SILENT_RULES([yes]) - AM_MAINTAINER_MODE # Init intltool @@ -18,55 +14,29 @@ AM_PROG_CC_C_O AC_HEADER_STDC -AC_ARG_ENABLE(more_warnings, - [AC_HELP_STRING([--enable-more-warnings], - [Add more warnings @<:@default=no@:>@])], - [enable_more_warnings="${enableval}"], - [enable_more_warnings=no] -) - -if test x"$enable_more_warnings" = x"yes"; then - ADDITIONAL_FLAGS="-Wall -Werror=all -Werror=format -Werror=implicit-function-declaration -Werror=implicit-int -Werror=missing-braces -Werror=parentheses -Werror=return-type -Werror=strict-aliasing -Werror=switch -Wuninitialized -Werror=unused-label -Werror=unused-value -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Werror=missing-declarations -Wredundant-decls -Wmissing-noreturn -Wpointer-arith -Wcast-align -Wwrite-strings -Werror=inline -Werror=format-nonliteral -Wformat-nonliteral -Werror=format-security -Wformat-security -Winit-self -Werror=missing-include-dirs -Werror=undef -Werror=aggregate-return -Wmissing-format-attribute -Werror=nested-externs -fno-strict-aliasing -fmessage-length=0 -Wp,-D_FORTIFY_SOURCE=2 -DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES" -fi -AC_SUBST(ADDITIONAL_FLAGS) - -AC_ARG_ENABLE(gtk3, -AC_HELP_STRING([--enable-gtk3],[enable to use gtk-3.0 instead of gtk-2.0]), -[case "${enableval}" in - yes) enable_gtk3=yes ;; - no) enable_gtk3=no ;; - *) AC_MSG_ERROR([bad value "${enableval}" for --enable-gtk3, use "yes" (default) or "no".]) ;; -esac],[]) - -if test "x$enable_gtk3" = "xyes" ; then - CFLAGS="$CFLAGS -DENABLE_GTK3" - gtk_modules="gtk+-3.0 >= 3.0.0" -else - gtk_modules="gtk+-2.0 >= 2.12.0" -fi +gtk_modules="gtk+-2.0 >= 2.12.0" PKG_CHECK_MODULES(GTK, [$gtk_modules]) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) +# Gtk Builder +AC_PATH_PROG([GTK_BUILDER_CONVERT],[gtk-builder-convert],[false]) +if test "$GTK_BUILDER_CONVERT" = "false"; then + AC_MSG_ERROR([gtk-builder-convert not found]) +fi + GETTEXT_PACKAGE=lxsession-edit AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) -# Generate po/LINGUAS on the fly rather than relying on translators -# to maintain it manually. This also overcome the problem that Transifex -# cannot add a language to po/LINGUAS if a new po file is submitted. -rm -f $srcdir/po/LINGUAS -for po_file in `ls $srcdir/po/*.po | sort`; -do - lang=`echo "$po_file" | sed "s|.*/po/\(.*\)\.po|\1|g"` - echo $lang >> $srcdir/po/LINGUAS -done - +dnl Add the languages which your application supports here. +ALL_LINGUAS="af ar cs da de es et eu fa fi fr gl hr hu id it ja ko lt ml ms nb nl nn pl ps pt pt_BR ru sk sl sv tr uk ur ur_PK vi zh_CN zh_TW" AM_GLIB_GNU_GETTEXT AC_OUTPUT([ Makefile src/Makefile po/Makefile.in +lxsession-edit.desktop ]) diff -Nru lxsession-edit-0.2.0/data/lxsession-edit.ui lxsession-edit-0.2.0~svn20090913/data/lxsession-edit.ui --- lxsession-edit-0.2.0/data/lxsession-edit.ui 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/data/lxsession-edit.ui 2009-09-13 11:07:11.000000000 +0000 @@ -1,302 +1,359 @@ - + + - - - True - False 10 + True Desktop Session Settings + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False 512 420 - dialog + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False True True - False + False + 0 True - False - end + GTK_BUTTONBOX_END - gtk-cancel True - True True - False - False + True + gtk-cancel True + GTK_RELIEF_NORMAL + True - - False - False - 0 - - gtk-ok True - True True - False - False + True + gtk-ok True + GTK_RELIEF_NORMAL + True - - False - False - 1 - + 0 False True - end - 0 + GTK_PACK_END True True + True + True + GTK_POS_TOP + False + False - True - False 12 + True + False 6 True - False + False 6 True - False - 0 Applications automatically started after entering desktop: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + 0 False False - 0 True True - automatic - automatic - in + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT True True + True + False + False + True + False + False + False + 0 True True - 1 + 0 True True - 0 - False 12 + GTK_BUTTONBOX_START 6 - start - gtk-add True - True True - False - False + True + gtk-add True + GTK_RELIEF_NORMAL + True - - False - False - 0 - - gtk-remove True - True True - False - False + True + gtk-remove True + GTK_RELIEF_NORMAL + True - - False - False - 1 - - gtk-edit True - True True - False - False + True + gtk-edit True + GTK_RELIEF_NORMAL + True - - False - False - 2 - + 0 False True - 1 + + False + True + True - False Automatically Started Applications + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - - False - - True - False 12 + True + False 6 True - False + False 6 True - False - Window Manager: + Window Manager: + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + 0 False False - 0 True - True - Command line used to launch window manager + Command line used to launch window manager (The default window manager command for LXDE should be openbox-lxde) - ● - False - False - True - True + True + True + True + 0 + + True + ● + False + 0 True True - 1 + 0 False True - 0 True - False + False 12 True - False gtk-dialog-warning - 6 + 6 + 0.5 + 0.5 + 0 + 0 + 0 False True - 0 True - False <b>Warning:</b> Do <b>NOT</b> touch this unless you know exactly what you are doing. <b>NOTE:</b> This setting will take effect on next login. + False True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + 0 False True - 1 + 0 False True - 1 - 1 + False + True True - False Advanced Options + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - - 1 - False - + 0 True True - 2 diff -Nru lxsession-edit-0.2.0/debian/changelog lxsession-edit-0.2.0~svn20090913/debian/changelog --- lxsession-edit-0.2.0/debian/changelog 2012-03-23 20:25:06.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/debian/changelog 2011-02-27 18:18:48.000000000 +0000 @@ -1,60 +1,28 @@ -lxsession-edit (0.2.0-1ubuntu2~ppa1) precise; urgency=low +lxsession-edit (0.2.0~svn20090913-0ubuntu3~ppa1) natty; urgency=low - * debian/patches: - - + * Convert to source format 3.0 (quilt) + * debian/patches + - 02-read-XDG_CURRENT_DESKTOP.patch: Convert to quilt format. + - 03_enable_desktop_translations.patch: Enable translation in desktop file. + - 80_translations.patch: Update translations from upstream git (2011-02-27) + - 81_update_template.patch - -- Julien Lavergne Fri, 23 Mar 2012 21:24:29 +0100 + -- Julien Lavergne Sun, 27 Feb 2011 19:18:42 +0100 -lxsession-edit (0.2.0-1ubuntu1) oneiric; urgency=low +lxsession-edit (0.2.0~svn20090913-0ubuntu2) lucid; urgency=low - * Sync with Debian unstable. Ubuntu remaining changes : - * debian/control: - - Correct typo and English in Desciption:. (LP: #526650) - - -- Julien Lavergne Fri, 29 Jul 2011 00:20:00 +0200 - -lxsession-edit (0.2.0-1) unstable; urgency=low - - * Enable team maintenance Added Vcs-Git and Vcs-Browser tags - * Update url on Vcs-Git and Vcs-Brower tags. - * Bump Standard-Version to 3.9.2 - * Use debhelper 8 - * Merging upstream version 0.2.0: - - Add an option to compile with gtk3 - - Add icon for the window (patch by Jonathan Marsden) - - Update logical for session ID to XDG_CURRENT_DESKTOP (Patch 2979618) - - Fixed build loop problem - - Support new config file format of lxsession (Closes: #602612) - - Use NotShowIn=GNOME;KDE;XFCE; in .desktop file (Closes: #597842) - * Fixing grammar errer in descirption. (Closes: #585738) - Thanks Steve Holmes . - * Drop 01_fix_infinite_loop.dpatch. - * Sorting build-depends. - * Drop dpatch in build-depends. - * Warpping build-depends. - * Removing debian/dirs: Let upstream's makefile does the work. - * Removin debian/docs: Empty NEWS and useless README file. - * Compacting watch file. - * Compacting rules file. - * Use debian source format 3.0 (quilt). - * Added debian/source/options file. - - -- Andrew Lee (李健秋) Mon, 25 Jul 2011 00:00:26 +0800 - -lxsession-edit (0.1.1-3) unstable; urgency=low - - * Added Vcs-Git and Vcs-Browser tags - * Enable team maintenance Added Vcs-Git and Vcs-Browser tags - * Update url on Vcs-Git and Vcs-Brower tags. - * Bump Standard-Version to 3.9.2 - * Use debhelper 8 - * Merging upstream version 0.2.0: - - Add an option to compile with gtk3 - - Add icon for the window (patch by Jonathan Marsden) - - Update logical for session ID to XDG_CURRENT_DESKTOP (Patch 2979618) - - Fixed build loop problem - Support new config file format of lxsession + * debian/patches/02-read-XDG_CURRENT_DESKTOP.dpatch + - Use XDG_CURRENT_DESKTOP to read LXDE session when Lubuntu is used. + (LP: #551266) - -- Andrew Lee (李健秋) Sun, 24 Jul 2011 23:31:55 +0800 + -- Julien Lavergne Tue, 30 Mar 2010 23:36:16 +0200 + +lxsession-edit (0.2.0~svn20090913-0ubuntu1) lucid; urgency=low + + * New upstream snapshot to bring support for the new lxsession. + * debian/patches: 01_fix_infinite_loop.dpatch: disable, merged upstream. + + -- Julien Lavergne Wed, 04 Nov 2009 22:18:23 +0100 lxsession-edit (0.1.1-2) unstable; urgency=low diff -Nru lxsession-edit-0.2.0/debian/compat lxsession-edit-0.2.0~svn20090913/debian/compat --- lxsession-edit-0.2.0/debian/compat 2011-07-24 16:03:06.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/debian/compat 2011-02-27 17:52:49.000000000 +0000 @@ -1 +1 @@ -8 +7 diff -Nru lxsession-edit-0.2.0/debian/control lxsession-edit-0.2.0~svn20090913/debian/control --- lxsession-edit-0.2.0/debian/control 2011-07-28 22:20:17.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/debian/control 2011-02-27 17:56:14.000000000 +0000 @@ -2,19 +2,15 @@ Section: utils Priority: extra Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian LXDE Packaging Team -Uploaders: Andrew Lee (李健秋) -Build-Depends: - debhelper (>= 8), automake, autotools-dev, intltool, libglib2.0-dev(>=2.10), - libgtk2.0-dev (>=2.6) -Standards-Version: 3.9.2 +XSBC-Original-Maintainer: Andrew Lee (李健秋) +Build-Depends: debhelper (>= 7), autotools-dev, automake, intltool, libgtk2.0-dev (>=2.6), libglib2.0-dev(>=2.10) +Standards-Version: 3.8.2 Homepage: http://lxde.org -Vcs-Browser: http://git.debian.org/?p=pkg-lxde/lxsession-edit.git;a=summary -Vcs-Git: git://git.debian.org/git/pkg-lxde/lxsession-edit.git Package: lxsession-edit Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: configures which applications start up automatically in LXDE +Description: configure what application start up automaticlly in LXDE LXSession-Edit is a simple session editor GUI for lxsession-lite which follows autostart specs from FreeDesktop.Org + diff -Nru lxsession-edit-0.2.0/debian/dirs lxsession-edit-0.2.0~svn20090913/debian/dirs --- lxsession-edit-0.2.0/debian/dirs 1970-01-01 00:00:00.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/debian/dirs 2011-02-27 17:52:49.000000000 +0000 @@ -0,0 +1,2 @@ +usr/bin +usr/sbin diff -Nru lxsession-edit-0.2.0/debian/docs lxsession-edit-0.2.0~svn20090913/debian/docs --- lxsession-edit-0.2.0/debian/docs 1970-01-01 00:00:00.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/debian/docs 2011-02-27 17:52:49.000000000 +0000 @@ -0,0 +1,2 @@ +NEWS +README diff -Nru lxsession-edit-0.2.0/debian/patches/01_fix_session_name.patch lxsession-edit-0.2.0~svn20090913/debian/patches/01_fix_session_name.patch --- lxsession-edit-0.2.0/debian/patches/01_fix_session_name.patch 2012-03-23 20:24:21.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/debian/patches/01_fix_session_name.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -Author: Julien Lavergne -Bug-Ubuntu: - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- lxsession-edit-0.2.0.orig/src/lxsession-edit.c -+++ lxsession-edit-0.2.0/src/lxsession-edit.c -@@ -394,7 +394,7 @@ int main(int argc, char** argv) - if( argc > 1 ) - session_name = argv[1]; - else -- session_name = g_getenv("XDG_CURRENT_DESKTOP"); -+ session_name = g_getenv("DESKTOP_SESSION"); - - if( G_UNLIKELY(!session_name) ) - session_name = "LXDE"; -@@ -449,6 +449,8 @@ int main(int argc, char** argv) - /* If it's our favorite, LXDE */ - if( strcmp(session_name, "LXDE") == 0 ) - wm_cmd = g_strdup("openbox-lxde"); -+ else if ( strcmp(session_name, "Lubuntu") == 0 ) -+ wm_cmd = g_strdup("openbox-lubuntu"); - else - wm_cmd = g_strdup("openbox"); - } diff -Nru lxsession-edit-0.2.0/debian/patches/02-read-XDG_CURRENT_DESKTOP.patch lxsession-edit-0.2.0~svn20090913/debian/patches/02-read-XDG_CURRENT_DESKTOP.patch --- lxsession-edit-0.2.0/debian/patches/02-read-XDG_CURRENT_DESKTOP.patch 1970-01-01 00:00:00.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/debian/patches/02-read-XDG_CURRENT_DESKTOP.patch 2011-02-27 18:01:44.000000000 +0000 @@ -0,0 +1,15 @@ +## Use XDG_CURRENT_DESKTOP to read LXDE session when Lubuntu is used +## https://bugs.launchpad.net/ubuntu/+source/lxsession-edit/+bug/551266 +Index: lxsession-edit-0.2.0~svn20090913/src/lxsession-edit.c +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/src/lxsession-edit.c 2011-02-27 19:00:39.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/src/lxsession-edit.c 2011-02-27 19:01:12.000000000 +0100 +@@ -394,7 +394,7 @@ + if( argc > 1 ) + session_name = argv[1]; + else +- session_name = g_getenv("DESKTOP_SESSION"); ++ session_name = g_getenv("XDG_CURRENT_DESKTOP"); + + if( G_UNLIKELY(!session_name) ) + session_name = "LXDE"; diff -Nru lxsession-edit-0.2.0/debian/patches/03_enable_desktop_translations.patch lxsession-edit-0.2.0~svn20090913/debian/patches/03_enable_desktop_translations.patch --- lxsession-edit-0.2.0/debian/patches/03_enable_desktop_translations.patch 1970-01-01 00:00:00.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/debian/patches/03_enable_desktop_translations.patch 2011-02-27 18:14:31.000000000 +0000 @@ -0,0 +1,50 @@ +Index: lxsession-edit-0.2.0~svn20090913/Makefile.am +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/Makefile.am 2011-02-27 19:08:33.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/Makefile.am 2011-02-27 19:14:21.000000000 +0100 +@@ -1,11 +1,15 @@ + ## Process this file with automake to produce Makefile.in ++NULL= + + SUBDIRS = src po + + desktopdir = $(datadir)/applications +-desktop_DATA = lxsession-edit.desktop ++desktop_in_files = \ ++ lxsession-edit.desktop.in \ ++ $(NULL) ++desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) ++@INTLTOOL_DESKTOP_RULE@ + +-#@INTLTOOL_DESKTOP_RULE@ + DISTCLEANFILES = lxsession-edit.desktop + + #icondir = $(datadir)/share/icons/hicolor/128x128 +Index: lxsession-edit-0.2.0~svn20090913/configure.in +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/configure.in 2011-02-27 19:08:44.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/configure.in 2011-02-27 19:12:15.000000000 +0100 +@@ -37,6 +37,5 @@ + Makefile + src/Makefile + po/Makefile.in +-lxsession-edit.desktop + ]) + +Index: lxsession-edit-0.2.0~svn20090913/lxsession-edit.desktop.in +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/lxsession-edit.desktop.in 2011-02-27 19:08:20.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/lxsession-edit.desktop.in 2011-02-27 19:12:06.000000000 +0100 +@@ -2,11 +2,7 @@ + Type=Application + Icon=xfwm4 + Exec=lxsession-edit +-Name=Desktop Session Settings +-Name[de]=Sitzungseigenschaften +-Name[fi]=Työpöytäistunnon asetukset +-Name[ja]=デスクトップセッションの設定 +-Name[zh_TW]=桌面工作階段設定 ++_Name=Desktop Session Settings + Comment=Manage applications loaded in desktop session + Comment[de]=Automatisch gestartete Anwendungen verwalten + Comment[fi]=Hallitse automaattisesti käynnistettäviä sovelluksia diff -Nru lxsession-edit-0.2.0/debian/patches/80_translations.patch lxsession-edit-0.2.0~svn20090913/debian/patches/80_translations.patch --- lxsession-edit-0.2.0/debian/patches/80_translations.patch 1970-01-01 00:00:00.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/debian/patches/80_translations.patch 2011-02-27 17:59:53.000000000 +0000 @@ -0,0 +1,4230 @@ +Index: lxsession-edit-0.2.0~svn20090913/po/zh_CN.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/zh_CN.po 2011-02-27 18:57:57.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/zh_CN.po 2011-02-27 18:49:34.000000000 +0100 +@@ -1,32 +1,31 @@ + # SOME DESCRIPTIVE TITLE. + # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER + # This file is distributed under the same license as the PACKAGE package. +-# FIRST AUTHOR , YEAR. ++# Funda Wang , 2009. + # +-#, fuzzy + msgid "" + msgstr "" +-"Project-Id-Version: PACKAGE VERSION\n" ++"Project-Id-Version: lxsession-edit 0.2.0\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" + "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +-"Last-Translator: FULL NAME \n" +-"Language-Team: LANGUAGE \n" ++"Last-Translator: Funda Wang \n" ++"Language-Team: Funda Wang \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" +-msgstr "" ++msgstr "启用" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" +-msgstr "" ++msgstr "应用程序" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" +-msgstr "" ++msgstr "注释" + + #: ../data/lxsession-edit.glade.h:1 + msgid "" +@@ -35,29 +34,38 @@ + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" ++"警告：除非您完全了解此程序的功能，否则请不要使用此工具。\n" ++"\n" ++"注意：此设置将会在下次登录时生效。" + + #: ../data/lxsession-edit.glade.h:4 + msgid "Advanced Options" +-msgstr "" ++msgstr "高级选项" + + #: ../data/lxsession-edit.glade.h:5 + msgid "Applications automatically started after entering desktop:" +-msgstr "" ++msgstr "进入桌面后自动启动的应用程序：" + + #: ../data/lxsession-edit.glade.h:6 + msgid "Automatically Started Applications" +-msgstr "" ++msgstr "自动启动的应用程序" + + #: ../data/lxsession-edit.glade.h:7 + msgid "" + "Command line used to launch window manager\n" + "(The default window manager command for LXDE should be openbox-lxde)" + msgstr "" ++"用于启动窗口管理器的命令行\n" ++"(LXDE 默认的窗口管理器命令应该是 openbox-lxde)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" +-msgstr "" ++msgstr "桌面会话设置" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " +-msgstr "" ++msgstr "窗口管理器：" ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "管理在桌面会话中装入的应用程序" +Index: lxsession-edit-0.2.0~svn20090913/po/zh_TW.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/zh_TW.po 2011-02-27 18:57:57.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/zh_TW.po 2011-02-27 18:49:34.000000000 +0100 +@@ -7,7 +7,7 @@ + msgstr "" + "Project-Id-Version: lxsession-edit 0.1\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" + "PO-Revision-Date: 2008-12-02 16:38+0800\n" + "Last-Translator: \n" + "Language-Team: zh_TW \n" +@@ -17,15 +17,15 @@ + "X-Poedit-Language: Chinese\n" + "X-Poedit-Country: TAIWAN\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "啟用" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "應用程式" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "說明" + +@@ -61,10 +61,14 @@ + "用來啟動視窗管理程式的命令列\n" + "(LXDE 下預設的視窗管理程式命令應設為 openbox-lxde)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "桌面工作階段設定" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " + msgstr "視窗管理程式：" ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "管理桌面工作階段中載入的程式" +Index: lxsession-edit-0.2.0~svn20090913/po/si.po +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ lxsession-edit-0.2.0~svn20090913/po/si.po 2011-02-27 18:49:34.000000000 +0100 +@@ -0,0 +1,69 @@ ++# SOME DESCRIPTIVE TITLE. ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# FIRST AUTHOR , YEAR. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: 2011-02-27 08:37+0200\n" ++"Last-Translator: Danishka \n" ++"Language-Team: LANGUAGE \n" ++"Language: si\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++"X-Generator: Pootle 2.0.5\n" ++ ++#: ../src/lxsession-edit.c:362 ++msgid "Enabled" ++msgstr "සක්‍රීයයි" ++ ++#: ../src/lxsession-edit.c:367 ++msgid "Application" ++msgstr "යෙදුම්" ++ ++#: ../src/lxsession-edit.c:375 ++msgid "Comment" ++msgstr "සටහන" ++ ++#: ../data/lxsession-edit.glade.h:1 ++msgid "" ++"Warning: Do NOT touch this unless you know exactly what you " ++"are doing.\n" ++"\n" ++"NOTE: This setting will take effect on next login." ++msgstr "" ++ ++#: ../data/lxsession-edit.glade.h:4 ++msgid "Advanced Options" ++msgstr "උසස් සැකසුම්" ++ ++#: ../data/lxsession-edit.glade.h:5 ++msgid "Applications automatically started after entering desktop:" ++msgstr "වැඩතලයට පිවිසි පසු යෙදුම් ස්වයංක්‍රීයව අරඹන්න:" ++ ++#: ../data/lxsession-edit.glade.h:6 ++msgid "Automatically Started Applications" ++msgstr "යෙදුම් ස්වයංක්‍රීයව අරඹන්න" ++ ++#: ../data/lxsession-edit.glade.h:7 ++msgid "" ++"Command line used to launch window manager\n" ++"(The default window manager command for LXDE should be openbox-lxde)" ++msgstr "" ++ ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 ++msgid "Desktop Session Settings" ++msgstr "වැඩතල සැසි සැකසුම්" ++ ++#: ../data/lxsession-edit.glade.h:10 ++msgid "Window Manager: " ++msgstr "කවුළු කළමණාකරුr: " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "වැඩතල සැසියක පූරණය වූ යෙදුම් කළමණාකරනය" +Index: lxsession-edit-0.2.0~svn20090913/po/ml.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/ml.po 2011-02-27 18:57:57.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/ml.po 2011-02-27 18:49:34.000000000 +0100 +@@ -8,7 +8,7 @@ + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" + "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" + "Last-Translator: FULL NAME \n" + "Language-Team: LANGUAGE \n" +@@ -16,15 +16,15 @@ + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "" + +@@ -54,10 +54,14 @@ + "(The default window manager command for LXDE should be openbox-lxde)" + msgstr "" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " + msgstr "" ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "" +Index: lxsession-edit-0.2.0~svn20090913/po/tr.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/tr.po 2011-02-27 18:57:57.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/tr.po 2011-02-27 18:49:34.000000000 +0100 +@@ -2,62 +2,72 @@ + # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER + # This file is distributed under the same license as the PACKAGE package. + # FIRST AUTHOR , YEAR. +-# +-#, fuzzy ++# + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-05-01 15:32+0200\n" +-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +-"Last-Translator: FULL NAME \n" ++"POT-Creation-Date: 2010-09-05 05:46+0000\n" ++"PO-Revision-Date: 2010-01-27 19:00+0200\n" ++"Last-Translator: Kılıç \n" + "Language-Team: LANGUAGE \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"Language: tr\n" ++"Plural-Forms: nplurals=1; plural=0;\n" ++"X-Generator: Pootle 2.0.1\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" +-msgstr "" ++msgstr "Etkin" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" +-msgstr "" ++msgstr "Uygulama" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" +-msgstr "" ++msgstr "Yorum" + + #: ../data/lxsession-edit.glade.h:1 + msgid "" +-"Warning: Do NOT touch this unless you know exactly what you " +-"are doing.\n" ++"Warning: Do NOT touch this unless you know exactly what you are doing.\n" + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" ++"Uyarı: Ne yaptığınızı tam olarak bilmiyorsanız buna DOKUNMAYIN .\n" ++"\n" ++"NOT: Bu değişiklik bir sonraki girişte etkinleşecek." + + #: ../data/lxsession-edit.glade.h:4 + msgid "Advanced Options" +-msgstr "" ++msgstr "Gelişmiş Seçenekler" + + #: ../data/lxsession-edit.glade.h:5 + msgid "Applications automatically started after entering desktop:" +-msgstr "" ++msgstr "Masaüstüne girdikten sonra kendiliğinden başlayan uygulamalar:" + + #: ../data/lxsession-edit.glade.h:6 + msgid "Automatically Started Applications" +-msgstr "" ++msgstr "Kendiliğinden başlayan uygulamalar" + + #: ../data/lxsession-edit.glade.h:7 + msgid "" + "Command line used to launch window manager\n" + "(The default window manager command for LXDE should be openbox-lxde)" + msgstr "" ++"Pencere yöneticisini açmak için kullanılan komut satırı\n" ++"(LXDE için öntanımlı pencere yöneticisi komutu openbox-lxde olmalı)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" +-msgstr "" ++msgstr "Masaüstü Oturumu Ayarları" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " +-msgstr "" ++msgstr "Pencere Yöneticisi" ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Masaüstü oturumunda yüklenen uygulamaları yönet" +Index: lxsession-edit-0.2.0~svn20090913/po/es.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/es.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/es.po 2011-02-27 18:49:34.000000000 +0100 +@@ -8,26 +8,27 @@ + msgstr "" + "Project-Id-Version: lxsession-edit\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" +-"PO-Revision-Date: 2009-05-31 16:28+0200\n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: 2010-01-20 14:32+0200\n" + "Last-Translator: Hugo Florentino \n" + "Language-Team: Spanish \n" ++"Language: es\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" +-"X-Generator: Pootle 1.1.0\n" ++"X-Generator: Pootle 2.0.1\n" + "X-Poedit-Language: Spanish\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "Activado" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "Aplicación" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "Comentario" + +@@ -38,10 +39,10 @@ + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" +-"Advertencia: NO edite esto, a menos que sepa exactamente lo " +-"que está haciendo.\n" ++"Advertencia: NO modifique esto, a menos que sepa exactamente " ++"lo que hace.\n" + "\n" +-"NOTA: Este ajuste surtirá efecto la próxima vez que inicie sesión." ++"NOTA: Este ajuste surtirá efecto en el próximo inicio de sesión." + + #: ../data/lxsession-edit.glade.h:4 + msgid "Advanced Options" +@@ -49,7 +50,7 @@ + + #: ../data/lxsession-edit.glade.h:5 + msgid "Applications automatically started after entering desktop:" +-msgstr "Aplicaciones que automáticamente inician después del escritorio:" ++msgstr "Aplicaciones iniciadas automáticamente tras entrar al escritorio:" + + #: ../data/lxsession-edit.glade.h:6 + msgid "Automatically Started Applications" +@@ -64,10 +65,14 @@ + "(El programa de línea de comandos de LXDE por omisión debería ser openbox-" + "lxde)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "Configuración de la sesión de escritorio" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " + msgstr "Gestor de ventanas: " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Gestiona las aplicaciones cargadas en la sesión de escritorio" +Index: lxsession-edit-0.2.0~svn20090913/po/fi.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/fi.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/fi.po 2011-02-27 18:49:34.000000000 +0100 +@@ -7,7 +7,7 @@ + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" + "PO-Revision-Date: 2008-12-02 20:50+0200\n" + "Last-Translator: Elias Julkunen \n" + "Language-Team: Finnish \n" +@@ -15,15 +15,15 @@ + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "Käytössä" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "Sovellus" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "Kommentti" + +@@ -59,10 +59,14 @@ + "Ikkunaohjelman käynnistämiseen käytettävä komento\n" + "(Oletuskomento LXDE:lle pitäisi olla openbox-lxde)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "Työpöytäistunnon asetukset" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " + msgstr "Ikkunakäsittelijä:" ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Hallitse automaattisesti käynnistettäviä sovelluksia" +Index: lxsession-edit-0.2.0~svn20090913/po/sl.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/sl.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/sl.po 2011-02-27 18:49:34.000000000 +0100 +@@ -1,30 +1,33 @@ ++# + msgid "" + msgstr "" + "Project-Id-Version: lxsession-edit\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" +-"PO-Revision-Date: 2009-06-28 17:48+0100\n" +-"Last-Translator: Matej Gačnik \n" ++"POT-Creation-Date: 2010-03-20 04:11+0000\n" ++"PO-Revision-Date: 2011-02-14 15:13+0200\n" ++"Last-Translator: Klemen \n" + "Language-Team: Slovenian \n" ++"Language: sl\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" +-"X-Generator: Pootle 1.1.0\n" ++"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " ++"n%100==4 ? 2 : 3);\n" ++"X-Generator: Pootle 2.0.5\n" + "X-Poedit-Language: Slovenian\n" + "X-Poedit-Country: SLOVENIA\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "Omogočeno" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "Program" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" +-msgstr "Komentar" ++msgstr "Opomba" + + #: ../data/lxsession-edit.glade.h:1 + msgid "" +@@ -32,35 +35,39 @@ + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" +-"Pozor: Ne spreminjajte, če niste prepričani o vašem dejanju! \n" ++"Opozorilo: Te možnosti se NE dotikajte, razen če veste, kaj " ++"delate!\n" + "\n" +-"OPOMBA: Te nastavitve bodo prešle v veljavo ob naslednji prijavi v sistem." ++"OPOMBA: Ta nastavitev bo uveljavljena ob naslednji prijavi v sistem." + + #: ../data/lxsession-edit.glade.h:4 + msgid "Advanced Options" +-msgstr "Napredne nastavitve" ++msgstr "Napredne možnosti" + + #: ../data/lxsession-edit.glade.h:5 + msgid "Applications automatically started after entering desktop:" +-msgstr "Samodejno zagnani programi po vstopu na namizje:" ++msgstr "Samodejno začeti programi po vstopu na namizje:" + + #: ../data/lxsession-edit.glade.h:6 + msgid "Automatically Started Applications" +-msgstr "Samodejno pognani programi" ++msgstr "Samodejno začeti programi" + + #: ../data/lxsession-edit.glade.h:7 + msgid "" + "Command line used to launch window manager\n" + "(The default window manager command for LXDE should be openbox-lxde)" + msgstr "" +-"Command line used to launch window manager\n" +-"(The default window manager command for LXDE should be openbox-lxde)" ++"Ukaz, ki zažene upravljalnika oken\n" ++"(privzeti ukaz upravljalnika oken za LXDE je openbox-lxde)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "Nastavitve namizne seje" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " +-msgstr "Upravitelj oken:" ++msgstr "Upravljalnik oken: " + ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Upravljajte s programi, naloženimi v namizni seji" +Index: lxsession-edit-0.2.0~svn20090913/po/bg.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/bg.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/bg.po 2011-02-27 18:49:34.000000000 +0100 +@@ -3,61 +3,73 @@ + # This file is distributed under the same license as the PACKAGE package. + # FIRST AUTHOR , YEAR. + # +-#, fuzzy + msgid "" + msgstr "" +-"Project-Id-Version: PACKAGE VERSION\n" ++"Project-Id-Version: lxsession\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" +-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +-"Last-Translator: FULL NAME \n" +-"Language-Team: LANGUAGE \n" +-"MIME-Version: 1.0\n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: 2010-03-31 00:37+0200\n" ++"Last-Translator: Радослав Иванов \n" ++"Language-Team: MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Pootle 1.1.0\n" ++"X-Poedit-Language: Bulgarian\n" ++"X-Poedit-Country: BULGARIA\n" ++"MIME-Version: 1.0\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" +-msgstr "" ++msgstr "Разрешен" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" +-msgstr "" ++msgstr "Програма" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" +-msgstr "" ++msgstr "Коментар" + + #: ../data/lxsession-edit.glade.h:1 + msgid "" +-"Warning: Do NOT touch this unless you know exactly what you " +-"are doing.\n" ++"Warning: Do NOT touch this unless you know exactly what you are doing.\n" + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" ++"Внимание: НЕ пипайте, ако не знаете какво ще направите.\n" ++"\n" ++"Забележка: Тези настройки ще влезат в сила при следващото вписване." + + #: ../data/lxsession-edit.glade.h:4 + msgid "Advanced Options" +-msgstr "" ++msgstr "Допълнителни опции" + + #: ../data/lxsession-edit.glade.h:5 + msgid "Applications automatically started after entering desktop:" +-msgstr "" ++msgstr "Приложения автоматично стартирани след влизането в работен плот:" + + #: ../data/lxsession-edit.glade.h:6 + msgid "Automatically Started Applications" +-msgstr "" ++msgstr "Автоматично стартирани програми" + + #: ../data/lxsession-edit.glade.h:7 + msgid "" + "Command line used to launch window manager\n" + "(The default window manager command for LXDE should be openbox-lxde)" + msgstr "" ++"Команден ред използван за старт на мениджъра на прозорци\n" ++"(Подразбиращата се команда в LXDE трябва да е openbox-lxde)" + + #: ../data/lxsession-edit.glade.h:9 ++#: ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" +-msgstr "" ++msgstr "Настройки на сесията на плота" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " +-msgstr "" ++msgstr "Мениджър на прозорци:" ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Управление на приложенията заредени в сесията" ++ +Index: lxsession-edit-0.2.0~svn20090913/po/vi.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/vi.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/vi.po 2011-02-27 18:49:34.000000000 +0100 +@@ -3,30 +3,32 @@ + # This file is distributed under the same license as the PACKAGE package. + # FIRST AUTHOR , YEAR. + # +-#, fuzzy + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" +-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +-"Last-Translator: FULL NAME \n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: 2010-01-26 08:34+0200\n" ++"Last-Translator: Hiếu \n" + "Language-Team: LANGUAGE \n" ++"Language: vi\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=1; plural=0;\n" ++"X-Generator: Pootle 2.0.1\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" +-msgstr "" ++msgstr "Thiết lập" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" +-msgstr "" ++msgstr "Ứng dụng" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" +-msgstr "" ++msgstr "Chú thích" + + #: ../data/lxsession-edit.glade.h:1 + msgid "" +@@ -35,29 +37,39 @@ + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" ++"Cảnh báo: Không sửa chỗ này trừ khi bạn biết chính xác bạn " ++"đang làm gì.\n" ++"\n" ++"CHÚ Ý: Thiếp lập này sẽ có hiệu lực trong lần đăng nhập tới." + + #: ../data/lxsession-edit.glade.h:4 + msgid "Advanced Options" +-msgstr "" ++msgstr "Tùy chọn Nâng cao" + + #: ../data/lxsession-edit.glade.h:5 + msgid "Applications automatically started after entering desktop:" +-msgstr "" ++msgstr "Ứng dụng tự khởi chạy sau khi đăng nhập: " + + #: ../data/lxsession-edit.glade.h:6 + msgid "Automatically Started Applications" +-msgstr "" ++msgstr "Ứng dụng tự khởi chạy" + + #: ../data/lxsession-edit.glade.h:7 + msgid "" + "Command line used to launch window manager\n" + "(The default window manager command for LXDE should be openbox-lxde)" + msgstr "" ++"Dòng lệnh được sử dụng để chạy chương trình quản lý cửa sổ\n" ++"(lệnh của chương trình quản lý cửa sổ mặc định cho LXDE là openbox-lxde)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" +-msgstr "" ++msgstr "Thiết lập phiên làm việc" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " +-msgstr "" ++msgstr "Chương trình quản lý cửa sổ:" ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Quản lý các ứng dụng được chạy trong phiên làm việc" +Index: lxsession-edit-0.2.0~svn20090913/po/lg.po +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ lxsession-edit-0.2.0~svn20090913/po/lg.po 2011-02-27 18:49:34.000000000 +0100 +@@ -0,0 +1,88 @@ ++# SOME DESCRIPTIVE TITLE. ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# FIRST AUTHOR , YEAR. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: 2010-10-04 01:02+0200\n" ++"Last-Translator: kizito \n" ++"Language-Team: LANGUAGE \n" ++"Language: lg\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++"X-Generator: Pootle 2.0.5\n" ++ ++# Heading for the feature activation tick boxes ++#: ../src/lxsession-edit.c:362 ++msgid "Enabled" ++msgstr "Ebikola" ++ ++# Heading for the selectable features ++#: ../src/lxsession-edit.c:367 ++msgid "Application" ++msgstr "Puloguramu" ++ ++# Heading for the feature descriptions ++#: ../src/lxsession-edit.c:375 ++msgid "Comment" ++msgstr "Okunnyonyola" ++ ++# Warning about changing the window manager ++#: ../data/lxsession-edit.glade.h:1 ++msgid "" ++"Warning: Do NOT touch this unless you know exactly what you " ++"are doing.\n" ++"\n" ++"NOTE: This setting will take effect on next login." ++msgstr "" ++"Kulabula:\n" ++"Bino TOBIKYUSA okugyako nga wekakasa ky'okola.\n" ++"\n" ++"GENDERERA:\n" ++"Ekitgekebwa wano kijjakukolera mu lutuula lwa LXDE lw'oddako oktandika." ++ ++# Title for the window manager setting tab ++#: ../data/lxsession-edit.glade.h:4 ++msgid "Advanced Options" ++msgstr "Entegeka ez'etaagisa bumanyirivu" ++ ++# Description text on the automatically started applications tab ++#: ../data/lxsession-edit.glade.h:5 ++msgid "Applications automatically started after entering desktop:" ++msgstr "Puloguramu ezinaatandikirawo ng'ofunye awakolerwa:" ++ ++# Title on the automatically started application selection tab ++#: ../data/lxsession-edit.glade.h:6 ++msgid "Automatically Started Applications" ++msgstr "Puloguramu ezinaatandikirawo" ++ ++# This is the text that appears in the tool-tip when youhover the cursor over the entry box. ++#: ../data/lxsession-edit.glade.h:7 ++msgid "" ++"Command line used to launch window manager\n" ++"(The default window manager command for LXDE should be openbox-lxde)" ++msgstr "" ++"Wano we wagenda ekiragiro eky'omu kiwandikiro ekitandisa puloguramu " ++"etabaganya awakolerwa\n" ++"(Mu ebya bulijjo, bw'oba wetaaga awakolerwa wakika kya LXDE, okozesanga " ++"puloguramu openbox-lxde)" ++ ++# This is the title of the window for the desktop session settings program ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 ++msgid "Desktop Session Settings" ++msgstr "Entegeka za Lutuula Lw'awakolerwa" ++ ++# This is the caption in front of the window manager entry box o the advanced settings tab ++#: ../data/lxsession-edit.glade.h:10 ++msgid "Window Manager: " ++msgstr "Puloguramu etabaganya awakolerwa: " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Tegeka puloguramu eziba zitandikir'awamu n'olutuula lw'awakolerwa" +Index: lxsession-edit-0.2.0~svn20090913/po/ps.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/ps.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/ps.po 2011-02-27 18:49:34.000000000 +0100 +@@ -8,7 +8,7 @@ + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" + "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" + "Last-Translator: FULL NAME \n" + "Language-Team: LANGUAGE \n" +@@ -16,15 +16,15 @@ + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "" + +@@ -54,10 +54,14 @@ + "(The default window manager command for LXDE should be openbox-lxde)" + msgstr "" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " + msgstr "" ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "" +Index: lxsession-edit-0.2.0~svn20090913/po/id.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/id.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/id.po 2011-02-27 18:49:34.000000000 +0100 +@@ -1,13 +1,13 @@ +-# Indonesian translations for lxsession-edit package. +-# Copyright (C) YEAR THE lxsession-edit'S COPYRIGHT HOLDER +-# This file is distributed under the same license as the lxsession-edit package. +-# Andhika Padmawan , Rahman Yusri Aftian , 2009. +-# ++# Indonesian translations for lxsession-edit package. ++# Copyright (C) YEAR THE lxsession-edit'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the lxsession-edit package. ++# Andhika Padmawan , Rahman Yusri Aftian , 2009. ++# + msgid "" + msgstr "" + "Project-Id-Version: lxsession-edit\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" ++"POT-Creation-Date: 2010-08-25 05:44+0000\n" + "PO-Revision-Date: 2009-03-04 22:57+0700\n" + "Last-Translator: Andhika Padmawan \n" + "Language-Team: Indonesian \n" +@@ -15,43 +15,41 @@ + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "Aktifkan" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "Aplikasi" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "Komentar" + +-#: ../data/lxsession-edit.glade.h:1 ++#: ../data/lxsession-edit.glade.h:1 + msgid "" +-"Warning: Do NOT touch this unless you know exactly what you " +-"are doing.\n" ++"Warning: Do NOT touch this unless you know exactly what you are doing.\n" + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" +-"Peringatan: JANGAN sentuh ini kecuali anda tahu persis apa " +-"yang anda lakukan.\n" ++"Peringatan: JANGAN sentuh ini kecuali anda tahu persis apa yang anda lakukan.\n" + "\n" + "CATATAN: Pengaturan ini akan diterapkan pada log masuk berikutnya." + +-#: ../data/lxsession-edit.glade.h:4 ++#: ../data/lxsession-edit.glade.h:4 + msgid "Advanced Options" + msgstr "Opsi Mahir" + +-#: ../data/lxsession-edit.glade.h:5 ++#: ../data/lxsession-edit.glade.h:5 + msgid "Applications automatically started after entering desktop:" + msgstr "Aplikasi yang otomatis berjalan setelah memasuki desktop:" + +-#: ../data/lxsession-edit.glade.h:6 ++#: ../data/lxsession-edit.glade.h:6 + msgid "Automatically Started Applications" + msgstr "Aplikasi Berjalan Otomatis" + +-#: ../data/lxsession-edit.glade.h:7 ++#: ../data/lxsession-edit.glade.h:7 + msgid "" + "Command line used to launch window manager\n" + "(The default window manager command for LXDE should be openbox-lxde)" +@@ -59,10 +57,14 @@ + "Baris perintah yang digunakan untuk menjalankan manajer jendela\n" + "(Perintah manajer jendela standar untuk LXDE harus merupakan openbox-lxde)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "Pengaturan Sesi Desktop" + +-#: ../data/lxsession-edit.glade.h:10 ++#: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " + msgstr "Manajer Jendela:" ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Kelola aplikasi yang dimuat pada sesi desktop" +Index: lxsession-edit-0.2.0~svn20090913/po/nl.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/nl.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/nl.po 2011-02-27 18:49:34.000000000 +0100 +@@ -7,33 +7,38 @@ + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" +-"PO-Revision-Date: 2009-05-04 15:26+0100\n" +-"Last-Translator: Sander De Voogdt \n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: 2010-02-26 15:00+0200\n" ++"Last-Translator: Sander \n" + "Language-Team: LANGUAGE \n" ++"Language: nl\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++"X-Generator: Pootle 2.0.1\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "Ingeschakeld" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "Applicatie" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "Commentaar" + + #: ../data/lxsession-edit.glade.h:1 + msgid "" +-"Warning: Do NOT touch this unless you know exactly what you are doing.\n" ++"Warning: Do NOT touch this unless you know exactly what you " ++"are doing.\n" + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" +-"Waarschuwing: Verander NIETS aan deze instellingen tenzij U exact weet wat u doet.\n" ++"Waarschuwing: Verander NIETS aan deze instellingen tenzij U " ++"exact weet wat u doet.\n" + "\n" + "NOTA: Deze verandering zal pas van kracht zijn na de volgende login." + +@@ -57,7 +62,7 @@ + "Opdrachtregel die gebruikt wordt op de window manager te starten\n" + "(Het standaard window manager commando voor LXDE is openbox-lxde)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "Desktop Sessie Instellingen" + +@@ -65,3 +70,6 @@ + msgid "Window Manager: " + msgstr "Window Manager:" + ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Beheer van programma's die gestart zijn in de desktop sessie/" +Index: lxsession-edit-0.2.0~svn20090913/po/ja.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/ja.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/ja.po 2011-02-27 18:49:34.000000000 +0100 +@@ -8,7 +8,7 @@ + msgstr "" + "Project-Id-Version: lxsession-edit 0.1\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-05-01 18:33+0900\n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" + "PO-Revision-Date: 2009-05-01 18:33+0900\n" + "Last-Translator: Hironao Komatsu \n" + "Language-Team: Japanese \n" +@@ -17,15 +17,15 @@ + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=1; plural=0;\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "有効" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "アプリケーション" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "コメント" + +@@ -61,10 +61,14 @@ + "ウィンドウマネージャを立ち上げるコマンドライン\n" + "(LXDE のデフォルトのウィンドウマネージャのコマンドは openbox-lxde です)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "デスクトップセッションの設定" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " + msgstr "ウィンドウマネージャ: " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "デスクトップセッションでロードされるアプリケーションを管理します" +Index: lxsession-edit-0.2.0~svn20090913/po/pt_BR.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/pt_BR.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/pt_BR.po 2011-02-27 18:49:34.000000000 +0100 +@@ -2,12 +2,12 @@ + # Copyright (C) 2009 The lxsession-edit authors. + # This file is distributed under the same license as the lxsession-edit package. + # Henrique P. Machado , 2009. +-# ++# + msgid "" + msgstr "" + "Project-Id-Version: 0.1\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" ++"POT-Creation-Date: 2010-02-07 04:35+0000\n" + "PO-Revision-Date: 2009-03-11 19:08-0300\n" + "Last-Translator: Henrique P. Machado \n" + "Language-Team: Brazilian Portuguese \n" +@@ -15,27 +15,25 @@ + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "Habilitado" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "Aplicativo" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "Comentário" + + #: ../data/lxsession-edit.glade.h:1 + msgid "" +-"Warning: Do NOT touch this unless you know exactly what you " +-"are doing.\n" ++"Warning: Do NOT touch this unless you know exactly what you are doing.\n" + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" +-"Aviso: Não toque nisto a não ser que você saiba exatamente o " +-"que está fazendo.\n" ++"Aviso: Não toque nisto a não ser que você saiba exatamente o que está fazendo.\n" + "\n" + "NOTA: Esta configuração terá efeito somente na próxima sessão." + +@@ -45,8 +43,7 @@ + + #: ../data/lxsession-edit.glade.h:5 + msgid "Applications automatically started after entering desktop:" +-msgstr "" +-"Aplicativos inicializados automaticamente após entrar no ambiente gráfico:" ++msgstr "Aplicativos inicializados automaticamente após entrar no ambiente gráfico:" + + #: ../data/lxsession-edit.glade.h:6 + msgid "Automatically Started Applications" +@@ -58,13 +55,16 @@ + "(The default window manager command for LXDE should be openbox-lxde)" + msgstr "" + "Linha de comando usada para lançar o gerenciador de janelas.\n" +-"(O comando do gerenciador de janelas padrão do LXDE deveria ser openbox-" +-"lxde)." ++"(O comando do gerenciador de janelas padrão do LXDE deveria ser openbox-lxde)." + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "Configurações de sessão do ambiente gráfico" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " + msgstr "Gerenciador de janelas: " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Configura aplicativos carregados na sessão da área de trabalho" +Index: lxsession-edit-0.2.0~svn20090913/po/nb.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/nb.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/nb.po 2011-02-27 18:49:34.000000000 +0100 +@@ -3,30 +3,32 @@ + # This file is distributed under the same license as the PACKAGE package. + # FIRST AUTHOR , YEAR. + # +-#, fuzzy + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" +-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +-"Last-Translator: FULL NAME \n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: 2010-11-03 19:47+0200\n" ++"Last-Translator: Sam \n" + "Language-Team: LANGUAGE \n" ++"Language: nb\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++"X-Generator: Pootle 2.0.5\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" +-msgstr "" ++msgstr "Aktivert" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" +-msgstr "" ++msgstr "Program" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" +-msgstr "" ++msgstr "Kommentar" + + #: ../data/lxsession-edit.glade.h:1 + msgid "" +@@ -35,29 +37,39 @@ + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" ++"Advarsel: IKKE rør dette hvis du ikke er helt sikker på hva du " ++"holder på med.\n" ++"\n" ++"MERK: Denne innstillingen endres ved neste innlogging." + + #: ../data/lxsession-edit.glade.h:4 + msgid "Advanced Options" +-msgstr "" ++msgstr "Avanserte innstillinger" + + #: ../data/lxsession-edit.glade.h:5 + msgid "Applications automatically started after entering desktop:" +-msgstr "" ++msgstr "Programmer som skal starte automatisk etter innlogging:" + + #: ../data/lxsession-edit.glade.h:6 + msgid "Automatically Started Applications" +-msgstr "" ++msgstr "Automatisk startede programmer" + + #: ../data/lxsession-edit.glade.h:7 + msgid "" + "Command line used to launch window manager\n" + "(The default window manager command for LXDE should be openbox-lxde)" + msgstr "" ++"Kommandolinjen blir brukt til å starte vindusbehandleren\n" ++"(Standardkommandoen for LXDEs vindusbehandler skal være openbox-lxde)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" +-msgstr "" ++msgstr "Innstillinger for skrivebordssesjon" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " +-msgstr "" ++msgstr "Vindusbehandler: _" ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Håndter program åpne i arbeidsøkta" +Index: lxsession-edit-0.2.0~svn20090913/po/bn.po +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ lxsession-edit-0.2.0~svn20090913/po/bn.po 2011-02-27 18:49:34.000000000 +0100 +@@ -0,0 +1,72 @@ ++# SOME DESCRIPTIVE TITLE. ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# Sankarshan , 2009. ++# Sadia Afroz , 2010. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: bn\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: 2010-01-31 17:44+0600\n" ++"Last-Translator: Sadia Afroz \n" ++"Language-Team: Bengali \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Pootle 1.1.0\n" ++ ++#: ../src/lxsession-edit.c:362 ++msgid "Enabled" ++msgstr "সক্রিয়" ++ ++#: ../src/lxsession-edit.c:367 ++msgid "Application" ++msgstr "অ্যাপ্লিকেশন" ++ ++#: ../src/lxsession-edit.c:375 ++msgid "Comment" ++msgstr "সমালোচনা" ++ ++#: ../data/lxsession-edit.glade.h:1 ++msgid "" ++"Warning: Do NOT touch this unless you know exactly what you " ++"are doing.\n" ++"\n" ++"NOTE: This setting will take effect on next login." ++msgstr "" ++"সতর্কীকরণ: এটা ধরবেন না যদি আপনি নিশ্চিতভাবে না জানেন যে আপনি " ++"কি করছেন।\n\nটীকা: এই সেটিংসমূহ পরবর্তী লগ ইনে কার্যকর হবে।" ++ ++#: ../data/lxsession-edit.glade.h:4 ++msgid "Advanced Options" ++msgstr "উন্নত অপশন" ++ ++#: ../data/lxsession-edit.glade.h:5 ++msgid "Applications automatically started after entering desktop:" ++msgstr "ডেস্কটপ চালু করার পর যে অ্যাপ্লিকেশনগুলো স্বয়ংক্রিয়ভাবে আরম্ভ হবে:" ++ ++#: ../data/lxsession-edit.glade.h:6 ++msgid "Automatically Started Applications" ++msgstr "স্বয়ংক্রিয়ভাবে চালু হওয়া অ্যাপ্লিকেশন" ++ ++#: ../data/lxsession-edit.glade.h:7 ++msgid "" ++"Command line used to launch window manager\n" ++"(The default window manager command for LXDE should be openbox-lxde)" ++msgstr "" ++"উইন্ডো ম্যানেজার চালু করার জন্য ব্যবহৃত কমান্ড লাইন\n(LXDE-র জন্য " ++"পূর্বনির্ধারিত উইন্ডো ম্যানেজার কম্যান্ড হল openbox-lxde)" ++ ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 ++msgid "Desktop Session Settings" ++msgstr "ডেস্কটপ সেশনের সেটিংসমূহ" ++ ++#: ../data/lxsession-edit.glade.h:10 ++msgid "Window Manager: " ++msgstr "উইন্ডো ম্যানেজার:" ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "ডেস্কটপ সেশনে লোডকৃত অ্যাপ্লিকেশনগুলো পরিচালনা করে" +Index: lxsession-edit-0.2.0~svn20090913/po/da.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/da.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/da.po 2011-02-27 18:49:34.000000000 +0100 +@@ -1,31 +1,32 @@ +-# SOME DESCRIPTIVE TITLE. +-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +-# This file is distributed under the same license as the PACKAGE package. +-# FIRST AUTHOR , YEAR. ++# Danish translation lxde.lxsession-edit. ++# Copyright (C) 2010 lxde.lxsession-edit & Joe Hansen. ++# This file is distributed under the same license as the lxde.lxsession-edit package ++# charlie tyrrestrup ++# Joe Hansen , 2010. + # + msgid "" + msgstr "" + "Project-Id-Version: lxsession-edit\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" +-"PO-Revision-Date: 2009-03-16 21:06+0100\n" +-"Last-Translator: charlie tyrrestrup \n" +-"Language-Team: da \n" ++"POT-Creation-Date: 2010-02-22 04:07+0000\n" ++"PO-Revision-Date: 2010-02-22 21:06+0100\n" ++"Last-Translator: Joe Hansen \n" ++"Language-Team: Danish \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" + "X-Generator: Pootle 1.1.0\n" + "X-Poedit-Language: Danish\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "Aktiveret" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "Program" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "Kommentar" + +@@ -38,11 +39,11 @@ + msgstr "" + "Advarsel: GØR IKKE noget her med mindre du ved nøjagtig hvad du gør.\n" + "\n" +-"BEMÆRK: Denne indstilling træder i kraft efter næste log ind." ++"BEMÆRK: Denne indstilling træder i kraft efter næste logind." + + #: ../data/lxsession-edit.glade.h:4 + msgid "Advanced Options" +-msgstr "Avancerede Indstillinger" ++msgstr "Avancerede indstillinger" + + #: ../data/lxsession-edit.glade.h:5 + msgid "Applications automatically started after entering desktop:" +@@ -50,7 +51,7 @@ + + #: ../data/lxsession-edit.glade.h:6 + msgid "Automatically Started Applications" +-msgstr "Programmer der Startes Automatisk " ++msgstr "Programmer der startes automatisk" + + #: ../data/lxsession-edit.glade.h:7 + msgid "" +@@ -58,12 +59,16 @@ + "(The default window manager command for LXDE should be openbox-lxde)" + msgstr "" + "Kommando der starter skrivebordsmiljøet\n" +-"(Standard skrivebordsmiljøet for LXDE, bør være openbox-lxde)" ++"(Standardskrivebordsmiljøet for LXDE bør være openbox-lxde)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" +-msgstr "Indstillinger for session" ++msgstr "Indstillinger for skrivebordssession" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " +-msgstr "Skrivebordsmiljø:" ++msgstr "Skrivebordsmiljø: " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Håndter programmer indlæst i skrivebordssessionen" +Index: lxsession-edit-0.2.0~svn20090913/po/sr@latin.po +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ lxsession-edit-0.2.0~svn20090913/po/sr@latin.po 2011-02-27 18:49:34.000000000 +0100 +@@ -0,0 +1,72 @@ ++# Serbian translation for LXSession-Edit package ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the LXSession-Edit package. ++# Jay A. Fleming , 2009. ++# ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: LXSession-Edit x\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2010-05-27 04:23+0000\n" ++"PO-Revision-Date: 2009-08-31 12:59+0100\n" ++"Last-Translator: Jay A. Fleming \n" ++"Language-Team: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" ++ ++#: ../src/lxsession-edit.c:362 ++msgid "Enabled" ++msgstr "Omogućeno" ++ ++#: ../src/lxsession-edit.c:367 ++msgid "Application" ++msgstr "Program" ++ ++#: ../src/lxsession-edit.c:375 ++msgid "Comment" ++msgstr "Primedba" ++ ++#: ../data/lxsession-edit.glade.h:1 ++msgid "" ++"Warning: Do NOT touch this unless you know exactly what you are doing.\n" ++"\n" ++"NOTE: This setting will take effect on next login." ++msgstr "" ++"PAŽNJA: NE MENJAJTE OVO ako ne znate šta radite.\n" ++"\n" ++"OBAVEŠTENJE: Ove promene će se primeniti od narednog prijavljivanja." ++ ++#: ../data/lxsession-edit.glade.h:4 ++msgid "Advanced Options" ++msgstr "Napredne postavke" ++ ++#: ../data/lxsession-edit.glade.h:5 ++msgid "Applications automatically started after entering desktop:" ++msgstr "Programi koji se automatski pokreću pri prijavljivanju:" ++ ++#: ../data/lxsession-edit.glade.h:6 ++msgid "Automatically Started Applications" ++msgstr "Programi koji se automatski pokreću" ++ ++#: ../data/lxsession-edit.glade.h:7 ++msgid "" ++"Command line used to launch window manager\n" ++"(The default window manager command for LXDE should be openbox-lxde)" ++msgstr "" ++"Naredba za pokretanje Upravljača prozora\n" ++"(Podrazumevana naredba za LXDE bi bila „openbox-lxde“)" ++ ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 ++msgid "Desktop Session Settings" ++msgstr "Podesite vaše sesije" ++ ++#: ../data/lxsession-edit.glade.h:10 ++msgid "Window Manager: " ++msgstr "Upravljača prozorima: " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Upravljanje aplikacijama učitanim u sesiju radne površi" +Index: lxsession-edit-0.2.0~svn20090913/po/ur_PK.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/ur_PK.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/ur_PK.po 2011-02-27 18:49:34.000000000 +0100 +@@ -7,7 +7,7 @@ + msgstr "" + "Project-Id-Version: lxsession-edit\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" + "PO-Revision-Date: 2009-05-10 03:42+0500\n" + "Last-Translator: Muhammad Ali Makki \n" + "Language-Team: Urdu \n" +@@ -19,25 +19,27 @@ + "X-Poedit-Country: PAKISTAN\n" + "X-Poedit-SourceCharset: utf-8\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "فعال" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "اطلاقیہ" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "تبصرہ" + + #: ../data/lxsession-edit.glade.h:1 + msgid "" +-"Warning: Do NOT touch this unless you know exactly what you are doing.\n" ++"Warning: Do NOT touch this unless you know exactly what you " ++"are doing.\n" + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" +-"انتباہ: انہیں مت چھیڑیںجب تک کہ آپ کو پختہ طور پر یہ معلوم نہ ہو کہ آپ کیا کرنے جارہے ہیں.\n" ++"انتباہ: انہیں مت چھیڑیںجب تک کہ آپ کو پختہ طور پر یہ معلوم نہ " ++"ہو کہ آپ کیا کرنے جارہے ہیں.\n" + "\n" + "نوٹ: ان تبدیلیوں کا اطلاق اگلی بار لاگ ان پر ہوگا." + +@@ -61,7 +63,7 @@ + "ونڈو منیجر کو چلانے کے لیے استعمال ہونے والی کمانڈ لائن\n" + "(طے شدہ ونڈو منیجر کی کمانڈ برائے ایل ایکس ڈی ای openbox-lxde ہونی چاہیے)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "ڈیسک ٹاپ نشست ترتیبات" + +@@ -69,3 +71,6 @@ + msgid "Window Manager: " + msgstr "ونڈو منیجر:" + ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "" +Index: lxsession-edit-0.2.0~svn20090913/po/ms.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/ms.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/ms.po 2011-02-27 18:49:34.000000000 +0100 +@@ -7,7 +7,7 @@ + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" + "PO-Revision-Date: 2009-05-24 06:44+0200\n" + "Last-Translator: Payne Samad Loh \n" + "Language-Team: LANGUAGE \n" +@@ -17,17 +17,17 @@ + "X-Generator: Pootle 1.1.0\n" + + # By Phyz +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "Membolehkan" + + # by Phyz +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "Aplikasi" + + # by Phyz +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "Komen" + +@@ -39,7 +39,8 @@ + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" +-"Amaran: Do NOT ubah sekiranya anda arif apa yang anda lakukan.\n" ++"Amaran: Do NOT ubah sekiranya anda arif apa yang anda " ++"lakukan.\n" + "\n" + "NOTE: Tetapan ini akan berkesan setelah log masuk." + +@@ -67,7 +68,7 @@ + "(Arahan pengurus tingkap default untuk LXDE sepatutnya openbox-lxde)" + + # by Phyz +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "Tetapan Sesi Desktop" + +@@ -75,3 +76,7 @@ + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " + msgstr "Pengurusan Tetingkap: " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "" +Index: lxsession-edit-0.2.0~svn20090913/po/de.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/de.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/de.po 2011-02-27 18:49:34.000000000 +0100 +@@ -5,7 +5,7 @@ + msgstr "" + "Project-Id-Version: \n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" + "PO-Revision-Date: 2009-01-25 16:41+0100\n" + "Last-Translator: Mario Blättermann \n" + "Language-Team: German \n" +@@ -15,15 +15,15 @@ + "X-Poedit-Language: German\n" + "X-Poedit-Country: GERMANY\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "Aktiviert" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "Anwendung" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "Beschreibung" + +@@ -59,10 +59,14 @@ + "Befehl für den Start des Fenstermanagers\n" + "(Der vorgegebene Fenstermanagerbefehl für LXDE sollte »openbox-lxde« lauten)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "Desktop-Sitzungseinstellungen" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " + msgstr "Fenstermanager:" ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Automatisch gestartete Anwendungen verwalten" +Index: lxsession-edit-0.2.0~svn20090913/po/uk.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/uk.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/uk.po 2011-02-27 18:49:34.000000000 +0100 +@@ -2,13 +2,13 @@ + # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER + # This file is distributed under the same license as the PACKAGE package. + # FIRST AUTHOR , YEAR. +-# ++# + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" +-"PO-Revision-Date: 2009-03-04 23:51+0100\n" ++"POT-Creation-Date: 2010-06-01 04:50+0000\n" ++"PO-Revision-Date: 2010-01-12 23:26+0100\n" + "Last-Translator: Y P \n" + "Language-Team: LANGUAGE \n" + "MIME-Version: 1.0\n" +@@ -16,27 +16,25 @@ + "Content-Transfer-Encoding: 8bit\n" + "X-Generator: Pootle 1.1.0\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" +-msgstr "Дозволено" ++msgstr "Включено" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "Програма" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "Коментар" + + #: ../data/lxsession-edit.glade.h:1 + msgid "" +-"Warning: Do NOT touch this unless you know exactly what you " +-"are doing.\n" ++"Warning: Do NOT touch this unless you know exactly what you are doing.\n" + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" +-"Попередження: НЕ ЧІПАЙТЕ це, якщо Ви не знаєте, що Ви " +-"збираєтеся зробити.\n" ++"Попередження: НЕ ЧІПАЙТЕ це, якщо Ви не знаєте, що Ви збираєтеся зробити.\n" + "\n" + "ПРИМІТКА: Ці налаштування будуть застосовані при наступному логуванні." + +@@ -46,7 +44,7 @@ + + #: ../data/lxsession-edit.glade.h:5 + msgid "Applications automatically started after entering desktop:" +-msgstr "Програми, які запускаються при запуску стільниці:" ++msgstr "Програми, які запускаються після входу:" + + #: ../data/lxsession-edit.glade.h:6 + msgid "Automatically Started Applications" +@@ -58,13 +56,16 @@ + "(The default window manager command for LXDE should be openbox-lxde)" + msgstr "" + "Командний рядок для запуску менеджера вікон\n" +-"(Командою по замовчуванню для менеджера вікон LXDE повниина бути openbox-" +-"lxde)" ++"(Командою по замовчуванню для менеджера вікон LXDE повинна бути openbox-lxde)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" +-msgstr "Налаштування сесії по замовчуванню" ++msgstr "Налаштування сесії робочого столу" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " + msgstr "Менеджер вікон: " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Керувати запущеними під час сесії програмами " +Index: lxsession-edit-0.2.0~svn20090913/po/ko.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/ko.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/ko.po 2011-02-27 18:49:34.000000000 +0100 +@@ -8,7 +8,7 @@ + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" + "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" + "Last-Translator: FULL NAME \n" + "Language-Team: LANGUAGE \n" +@@ -16,15 +16,15 @@ + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "" + +@@ -54,10 +54,14 @@ + "(The default window manager command for LXDE should be openbox-lxde)" + msgstr "" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " + msgstr "" ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "" +Index: lxsession-edit-0.2.0~svn20090913/po/frp.po +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ lxsession-edit-0.2.0~svn20090913/po/frp.po 2011-02-27 18:49:34.000000000 +0100 +@@ -0,0 +1,67 @@ ++# SOME DESCRIPTIVE TITLE. ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# FIRST AUTHOR , YEAR. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: 2009-10-21 15:53+0200\n" ++"Last-Translator: alexandre raymond \n" ++"Language-Team: LANGUAGE \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Pootle 1.1.0\n" ++ ++#: ../src/lxsession-edit.c:362 ++msgid "Enabled" ++msgstr "" ++ ++#: ../src/lxsession-edit.c:367 ++msgid "Application" ++msgstr "Applicacion" ++ ++#: ../src/lxsession-edit.c:375 ++msgid "Comment" ++msgstr "Comentéro" ++ ++#: ../data/lxsession-edit.glade.h:1 ++msgid "" ++"Warning: Do NOT touch this unless you know exactly what you " ++"are doing.\n" ++"\n" ++"NOTE: This setting will take effect on next login." ++msgstr "" ++ ++#: ../data/lxsession-edit.glade.h:4 ++msgid "Advanced Options" ++msgstr "Opcions avançâyes" ++ ++#: ../data/lxsession-edit.glade.h:5 ++msgid "Applications automatically started after entering desktop:" ++msgstr "Applicacions lançâyes automaticament dèns LXDE:" ++ ++#: ../data/lxsession-edit.glade.h:6 ++msgid "Automatically Started Applications" ++msgstr "Applicacions automaticament lançâyes:" ++ ++#: ../data/lxsession-edit.glade.h:7 ++msgid "" ++"Command line used to launch window manager\n" ++"(The default window manager command for LXDE should be openbox-lxde)" ++msgstr "" ++ ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 ++msgid "Desktop Session Settings" ++msgstr "" ++ ++#: ../data/lxsession-edit.glade.h:10 ++msgid "Window Manager: " ++msgstr "" ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "" +Index: lxsession-edit-0.2.0~svn20090913/po/sv.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/sv.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/sv.po 2011-02-27 18:49:34.000000000 +0100 +@@ -7,23 +7,24 @@ + msgstr "" + "Project-Id-Version: lxsession-edit\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" +-"PO-Revision-Date: 2009-01-05 12:38+0100\n" +-"Last-Translator: Daniel Nylander \n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: 2010-01-12 01:20+0100\n" ++"Last-Translator: Martin Bagge \n" + "Language-Team: Swedish \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Pootle 1.1.0\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "Aktiverad" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "Program" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "Kommentar" + +@@ -59,10 +60,14 @@ + "Kommandorad som används för att starta fönsterhanteraren\n" + "(Standardkommandot för fönsterhanterare för LXDE ska vara openbox-lxde)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "Inställningar för skrivbordssession" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " + msgstr "Fönsterhanterare: " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Hantera program som laddas i skrivbordssessionen" +Index: lxsession-edit-0.2.0~svn20090913/po/fa.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/fa.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/fa.po 2011-02-27 18:49:34.000000000 +0100 +@@ -3,30 +3,32 @@ + # This file is distributed under the same license as the PACKAGE package. + # FIRST AUTHOR , YEAR. + # +-#, fuzzy + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" +-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +-"Last-Translator: FULL NAME \n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: 2010-08-24 13:49+0200\n" ++"Last-Translator: Hamidreza \n" + "Language-Team: LANGUAGE \n" ++"Language: fa\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=1; plural=0;\n" ++"X-Generator: Pootle 2.0.5\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" +-msgstr "" ++msgstr "فعال شده" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" +-msgstr "" ++msgstr "برنامه" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" +-msgstr "" ++msgstr "توضیح" + + #: ../data/lxsession-edit.glade.h:1 + msgid "" +@@ -35,29 +37,39 @@ + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" ++"اخطار: به این گزینه دست نزن تا زمانی که دقیقا بدونی داری چکار " ++"می کنی.\n" ++"\n" ++"نکته: این تغییرات بر روی نشست بعدی اثر خواهد داشت." + + #: ../data/lxsession-edit.glade.h:4 + msgid "Advanced Options" +-msgstr "" ++msgstr "تنظیمات پیشرفته" + + #: ../data/lxsession-edit.glade.h:5 + msgid "Applications automatically started after entering desktop:" +-msgstr "" ++msgstr "نرم افزار هایی که بعد از ورود به دسکتاب، خودکار اجرا می شوند:" + + #: ../data/lxsession-edit.glade.h:6 + msgid "Automatically Started Applications" +-msgstr "" ++msgstr "ابزار های اجرا شده ی خودکار" + + #: ../data/lxsession-edit.glade.h:7 + msgid "" + "Command line used to launch window manager\n" + "(The default window manager command for LXDE should be openbox-lxde)" + msgstr "" ++"خط فرمان برای اجرا ی مدیر پنجره استفاده شده.\n" ++"(مدیر پنجره ی پیشفرض در LXDE باید openbox-lxde باشد.)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" +-msgstr "" ++msgstr "تنظیمات جلسه ای میزکار" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " +-msgstr "" ++msgstr "مدیر پنجره" ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "مدیریت نرم افزار های بارگذاری شده در این جلسه" +Index: lxsession-edit-0.2.0~svn20090913/po/hr.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/hr.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/hr.po 2011-02-27 18:49:34.000000000 +0100 +@@ -1,26 +1,32 @@ ++#Boljsa ++# Ivica Kolić <>, 2010. + msgid "" + msgstr "" + "Project-Id-Version: lxsession-edit_hr\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" +-"PO-Revision-Date: \n" +-"Last-Translator: Boljsa \n" +-"Language-Team: \n" ++"POT-Creation-Date: 2010-05-30 04:51+0000\n" ++"PO-Revision-Date: 2011-02-23 00:26+0200\n" ++"Last-Translator: zvacet \n" ++"Language-Team: \n" ++"Language: hr\n" + "MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=iso-8859-2\n" ++"Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" ++"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" ++"X-Generator: Pootle 2.0.5\n" + "X-Poedit-Language: Croatian\n" + "X-Poedit-Country: CROATIA\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" +-msgstr "Omogueno" ++msgstr "Omogućeno" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" +-msgstr "Aplikacija" ++msgstr "Aplikcija" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "Komentar" + +@@ -31,9 +37,9 @@ + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" +-"Upozorenje: NE diraj ovo osim ako tono zna to radi.\n" ++"Upozorenje: NE diraj ovo osim ako točno znaš što radiš.\n" + "\n" +-"NAPOMENA: Ova postavka e se primjeniti pri sljedeoj prijavi." ++"NAPOMENA: Ova postavka će se primjeniti pri sljedećoj prijavi." + + #: ../data/lxsession-edit.glade.h:4 + msgid "Advanced Options" +@@ -41,7 +47,7 @@ + + #: ../data/lxsession-edit.glade.h:5 + msgid "Applications automatically started after entering desktop:" +-msgstr "Aplikacije koje se automatski pokreu nakon ulaska na radnu povrinu:" ++msgstr "Aplikacije koje se automatski pokreću nakon ulaska na radnu površinu:" + + #: ../data/lxsession-edit.glade.h:6 + msgid "Automatically Started Applications" +@@ -52,14 +58,17 @@ + "Command line used to launch window manager\n" + "(The default window manager command for LXDE should be openbox-lxde)" + msgstr "" +-"Komandna linija navikla na pokretanje upravitelja prozora\n" +-"(Standardna naredba za upravitelj prpzora za LXDE trebala bi biti openbox-" +-"lxde)" ++"Naredbeni redak korišen za pokretanje upravitelja prozora\n" ++"(Zadana naredba za upravitelja prozora za LXDE trebala bi biti openbox-lxde)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" +-msgstr "Postavke Sesije Radne Povrine" ++msgstr "Postavke sesije radne površine" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " +-msgstr "Upravitelj Prozora:" ++msgstr "Upravitelj prozora: " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Upravljaj aplikacijama učitanima u sesiji radne površine" +Index: lxsession-edit-0.2.0~svn20090913/po/af.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/af.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/af.po 2011-02-27 18:49:34.000000000 +0100 +@@ -7,24 +7,26 @@ + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" +-"PO-Revision-Date: 2009-05-18 22:00+0200\n" +-"Last-Translator: F Wolff \n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: 2010-09-01 23:38+0200\n" ++"Last-Translator: F \n" + "Language-Team: LANGUAGE \n" ++"Language: af\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"X-Generator: Pootle 1.1.0\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++"X-Generator: Pootle 2.0.5\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "Gekativeer" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "Toepassing" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "Kommentaar" + +@@ -62,10 +64,14 @@ + "(Die verstekopdrag vir LXDE se vensterbestuurder behoort 'openbox-lxde' te " + "wees)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "Sessie-instellings vir die werkskerm" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " + msgstr "Vensterbestuurder: " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Bestuur toepassings wat in die werkskermsessie gelaai word" +Index: lxsession-edit-0.2.0~svn20090913/po/lt.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/lt.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/lt.po 2011-02-27 18:49:34.000000000 +0100 +@@ -2,47 +2,47 @@ + # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER + # This file is distributed under the same license as the PACKAGE package. + # FIRST AUTHOR , YEAR. +-# ++# + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" +-"PO-Revision-Date: 2009-04-06 10:39+0200\n" +-"Last-Translator: Anony mous \n" ++"POT-Creation-Date: 2010-04-16 04:13+0000\n" ++"PO-Revision-Date: 2010-01-14 10:54+0200\n" ++"Last-Translator: Julius Vitkauskas \n" + "Language-Team: LANGUAGE \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"X-Generator: Pootle 1.1.0\n" ++"Language: lt\n" ++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" ++"X-Generator: Pootle 2.0.0\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "Įjungta" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "Programa" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "Komentaras" + + #: ../data/lxsession-edit.glade.h:1 + msgid "" +-"Warning: Do NOT touch this unless you know exactly what you " +-"are doing.\n" ++"Warning: Do NOT touch this unless you know exactly what you are doing.\n" + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" +-"Perspėjimas: Nekeiskite šių nustatymų, nebent žinote ką " +-"darote.\n" ++"Perspėjimas: Nekeiskite šių nustatymų, nebent žinote ką darote!\n" + "\n" + "Pastaba: Kad šis nustatymas įsigaliotų, reiks atsijungti nuo sistemos." + + #: ../data/lxsession-edit.glade.h:4 + msgid "Advanced Options" +-msgstr "Sudėtingesni nustatymai" ++msgstr "Sudėtingesni" + + #: ../data/lxsession-edit.glade.h:5 + msgid "Applications automatically started after entering desktop:" +@@ -60,10 +60,14 @@ + "Komandinė eilutė langų tvarkyklei paleisti\n" + "(Numatytoji LXDE langų tvarkyklė yra openbox-lxde)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "Sesijos nustatymai" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " + msgstr "Langų tvarkyklė: " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Tvarkyti programas, paleidžiamas kartu su darbastaliu" +Index: lxsession-edit-0.2.0~svn20090913/po/nn.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/nn.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/nn.po 2011-02-27 18:49:34.000000000 +0100 +@@ -7,15 +7,15 @@ + msgstr "" + "Project-Id-Version: lxsession-edit\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-07-27 19:42+0200\n" +-"PO-Revision-Date: 2009-07-27 20:06+0200\n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: 2009-12-31 00:12+0100\n" + "Last-Translator: Karl Ove Hufthammer \n" + "Language-Team: Norwegian Nynorsk \n" + "MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=utf-8\n" ++"Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=2; plural=n != 1;\n" +-"X-Generator: Lokalize 0.3\n" ++"X-Generator: Lokalize 1.0\n" + + #: ../src/lxsession-edit.c:362 + msgid "Enabled" +@@ -61,10 +61,14 @@ + "Kommandolinje brukt til å køyra vindaugshandsamar.\n" + "(Standard vindaugshandsamar for LXDE er «openbox-lxde».)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "Øktoppsett" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " + msgstr "Vindaugshandsamar: " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Handsam program lasta i skrivebordsøkt" +Index: lxsession-edit-0.2.0~svn20090913/po/th.po +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ lxsession-edit-0.2.0~svn20090913/po/th.po 2011-02-27 18:49:34.000000000 +0100 +@@ -0,0 +1,67 @@ ++# SOME DESCRIPTIVE TITLE. ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# FIRST AUTHOR , YEAR. ++# ++#, fuzzy ++msgid "" ++msgstr "" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" ++"Last-Translator: FULL NAME \n" ++"Language-Team: LANGUAGE \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#: ../src/lxsession-edit.c:362 ++msgid "Enabled" ++msgstr "" ++ ++#: ../src/lxsession-edit.c:367 ++msgid "Application" ++msgstr "" ++ ++#: ../src/lxsession-edit.c:375 ++msgid "Comment" ++msgstr "" ++ ++#: ../data/lxsession-edit.glade.h:1 ++msgid "" ++"Warning: Do NOT touch this unless you know exactly what you " ++"are doing.\n" ++"\n" ++"NOTE: This setting will take effect on next login." ++msgstr "" ++ ++#: ../data/lxsession-edit.glade.h:4 ++msgid "Advanced Options" ++msgstr "" ++ ++#: ../data/lxsession-edit.glade.h:5 ++msgid "Applications automatically started after entering desktop:" ++msgstr "" ++ ++#: ../data/lxsession-edit.glade.h:6 ++msgid "Automatically Started Applications" ++msgstr "" ++ ++#: ../data/lxsession-edit.glade.h:7 ++msgid "" ++"Command line used to launch window manager\n" ++"(The default window manager command for LXDE should be openbox-lxde)" ++msgstr "" ++ ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 ++msgid "Desktop Session Settings" ++msgstr "" ++ ++#: ../data/lxsession-edit.glade.h:10 ++msgid "Window Manager: " ++msgstr "" ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "" +Index: lxsession-edit-0.2.0~svn20090913/po/et.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/et.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/et.po 2011-02-27 18:49:34.000000000 +0100 +@@ -8,7 +8,7 @@ + msgstr "" + "Project-Id-Version: lxsession-edit\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" + "PO-Revision-Date: 2009-08-23 17:21+0300\n" + "Last-Translator: Mattias Põldaru \n" + "Language-Team: Gnome Estonian Translation Team \n" +@@ -16,21 +16,22 @@ + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "Lubatud" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "Rakendus" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "Kommentaar" + + #: ../data/lxsession-edit.glade.h:1 + msgid "" +-"Warning: Do NOT touch this unless you know exactly what you are doing.\n" ++"Warning: Do NOT touch this unless you know exactly what you " ++"are doing.\n" + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" +@@ -58,7 +59,7 @@ + "Aknahalduri käivistamise käsurida\n" + "(vaikimisi LXDE aknahaldur on openbox-lxde)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "Töölauaseansi sätted" + +@@ -66,3 +67,6 @@ + msgid "Window Manager: " + msgstr "Aknahaldur:" + ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "" +Index: lxsession-edit-0.2.0~svn20090913/po/en_GB.po +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ lxsession-edit-0.2.0~svn20090913/po/en_GB.po 2011-02-27 18:49:34.000000000 +0100 +@@ -0,0 +1,70 @@ ++msgid "" ++msgstr "" ++"Project-Id-Version: lxsession-edit\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2010-03-28 04:11+0000\n" ++"PO-Revision-Date: \n" ++"Last-Translator: Steve Cook (Yorvyk) \n" ++"Language-Team: English UK en_GB \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\\n\n" ++"X-Poedit-Language: English\n" ++"X-Poedit-Country: UNITED KINGDOM\n" ++ ++#: ../src/lxsession-edit.c:362 ++msgid "Enabled" ++msgstr "Enabled" ++ ++#: ../src/lxsession-edit.c:367 ++msgid "Application" ++msgstr "Application" ++ ++#: ../src/lxsession-edit.c:375 ++msgid "Comment" ++msgstr "Comment" ++ ++#: ../data/lxsession-edit.glade.h:1 ++msgid "" ++"Warning: Do NOT touch this unless you know exactly what you are doing.\n" ++"\n" ++"NOTE: This setting will take effect on next login." ++msgstr "" ++"WARNING: Do NOT touch this unless you know exactly what you are doing.\n" ++"\n" ++"NOTE: This setting will take effect on next login." ++ ++#: ../data/lxsession-edit.glade.h:4 ++msgid "Advanced Options" ++msgstr "Advanced Options" ++ ++#: ../data/lxsession-edit.glade.h:5 ++msgid "Applications automatically started after entering desktop:" ++msgstr "Applications automatically started after entering desktop:" ++ ++#: ../data/lxsession-edit.glade.h:6 ++msgid "Automatically Started Applications" ++msgstr "Automatically Started Applications" ++ ++#: ../data/lxsession-edit.glade.h:7 ++msgid "" ++"Command line used to launch window manager\n" ++"(The default window manager command for LXDE should be openbox-lxde)" ++msgstr "" ++"Command line used to launch window manager\n" ++"(The default window manager command for LXDE should be openbox-lxde)" ++ ++#: ../data/lxsession-edit.glade.h:9 ++#: ../lxsession-edit.desktop.in.h:1 ++msgid "Desktop Session Settings" ++msgstr "Desktop Session Settings" ++ ++#: ../data/lxsession-edit.glade.h:10 ++msgid "Window Manager: " ++msgstr "Window Manager: " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Manage applications loaded in desktop session" ++ +Index: lxsession-edit-0.2.0~svn20090913/po/LINGUAS +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/LINGUAS 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/LINGUAS 2011-02-27 18:49:34.000000000 +0100 +@@ -1,18 +1,22 @@ +-# Please keep it in alphabetical order + af + ar + bg + bn_IN ++ca + cs + da + de ++el + es ++es_VE + et + eu + fa + fi + fr ++frp + gl ++he + hr + hu + id +@@ -27,8 +31,8 @@ + nn + pl + ps +-pt_BR + pt ++pt_BR + ru + sk + sl +@@ -41,3 +45,4 @@ + vi + zh_CN + zh_TW ++ +Index: lxsession-edit-0.2.0~svn20090913/po/es_VE.po +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ lxsession-edit-0.2.0~svn20090913/po/es_VE.po 2011-02-27 18:49:34.000000000 +0100 +@@ -0,0 +1,77 @@ ++# Spanish translation of lxsession-edit ++# Copyright (C) 2008 THE lxsession-edit'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the lxsession-edit package. ++# ++# Julio Napurí Carlos , 2008. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: lxsession-edit\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: 2009-05-31 16:28+0200\n" ++"Last-Translator: Hugo Florentino \n" ++"Language-Team: Spanish \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++"X-Generator: Pootle 1.1.0\n" ++"X-Poedit-Language: Spanish\n" ++ ++#: ../src/lxsession-edit.c:362 ++msgid "Enabled" ++msgstr "Activado" ++ ++#: ../src/lxsession-edit.c:367 ++msgid "Application" ++msgstr "Aplicación" ++ ++#: ../src/lxsession-edit.c:375 ++msgid "Comment" ++msgstr "Comentario" ++ ++#: ../data/lxsession-edit.glade.h:1 ++msgid "" ++"Warning: Do NOT touch this unless you know exactly what you " ++"are doing.\n" ++"\n" ++"NOTE: This setting will take effect on next login." ++msgstr "" ++"Advertencia: NO edite esto, a menos que sepa exactamente lo " ++"que está haciendo.\n" ++"\n" ++"NOTA: Este ajuste surtirá efecto la próxima vez que inicie sesión." ++ ++#: ../data/lxsession-edit.glade.h:4 ++msgid "Advanced Options" ++msgstr "Opciones avanzadas" ++ ++#: ../data/lxsession-edit.glade.h:5 ++msgid "Applications automatically started after entering desktop:" ++msgstr "Aplicaciones que automáticamente inician después del escritorio:" ++ ++#: ../data/lxsession-edit.glade.h:6 ++msgid "Automatically Started Applications" ++msgstr "Iniciar automáticamente las aplicaciones" ++ ++#: ../data/lxsession-edit.glade.h:7 ++msgid "" ++"Command line used to launch window manager\n" ++"(The default window manager command for LXDE should be openbox-lxde)" ++msgstr "" ++"La línea de comandos utilizada para lanzar el gestor de ventanas\n" ++"(El programa de línea de comandos de LXDE por omisión debería ser openbox-" ++"lxde)" ++ ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 ++msgid "Desktop Session Settings" ++msgstr "Configuración de la sesión de escritorio" ++ ++#: ../data/lxsession-edit.glade.h:10 ++msgid "Window Manager: " ++msgstr "Gestor de ventanas: " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "" +Index: lxsession-edit-0.2.0~svn20090913/po/pl.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/pl.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/pl.po 2011-02-27 18:49:34.000000000 +0100 +@@ -1,48 +1,49 @@ + # translation of lxsession-edit.po to Polish + # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER + # This file is distributed under the same license as the PACKAGE package. +-# ++# + # Grzegorz Gibas , 2009. + # Artur Kruszewski , 2009. + msgid "" + msgstr "" + "Project-Id-Version: lxsession-edit\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" +-"PO-Revision-Date: 2009-03-07 13:06-0000\n" +-"Last-Translator: Artur Kruszewski \n" ++"POT-Creation-Date: 2010-05-13 08:36+0000\n" ++"PO-Revision-Date: 2010-01-13 23:42+0200\n" ++"Last-Translator: Artur \n" + "Language-Team: Polish\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"X-Generator: KBabel 1.11.4\n" ++"Language: pl\n" ++"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" ++"X-Generator: Pootle 2.0.0\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "Włączone" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" +-msgstr "Aplikacja" ++msgstr "Program" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "Komentarz" + + #: ../data/lxsession-edit.glade.h:1 + msgid "" +-"Warning: Do NOT touch this unless you know exactly what you " +-"are doing.\n" ++"Warning: Do NOT touch this unless you know exactly what you are doing.\n" + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" +-"Uwaga: Nie dotykaj tego chyba, że dokładnie wiesz co robisz.\n" ++"Ostrzeżenie: Nie dotykaj tego, chyba, że wiesz dokładnie, co robisz.\n" + "\n" +-"NOTA: Efekty zmian będą widoczne po następnym logowaniu." ++"UWAGA: Efekty zmian będą widoczne po następnym zalogowaniu." + + #: ../data/lxsession-edit.glade.h:4 + msgid "Advanced Options" +-msgstr "Zaawansowane Opcje" ++msgstr "Opcje zaawansowane" + + #: ../data/lxsession-edit.glade.h:5 + msgid "Applications automatically started after entering desktop:" +@@ -50,7 +51,7 @@ + + #: ../data/lxsession-edit.glade.h:6 + msgid "Automatically Started Applications" +-msgstr "Automatycznie Uruchomione Aplikacje" ++msgstr "Programy uruchamiane automatycznie" + + #: ../data/lxsession-edit.glade.h:7 + msgid "" +@@ -58,12 +59,16 @@ + "(The default window manager command for LXDE should be openbox-lxde)" + msgstr "" + "Polecenie użyte do uruchomienia menedżera okien\n" +-"(Domyślnie dla LXDE powinno być openbox-lxde" ++"(Domyślnie dla LXDE powinno być openbox-lxde)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "Ustawienia sesji" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " +-msgstr "Menedżer Okien: " ++msgstr "Menedżer okien:" ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Zarządzaj programami uruchamianymi wraz ze środowiskiem LXDE" +Index: lxsession-edit-0.2.0~svn20090913/po/ro.po +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ lxsession-edit-0.2.0~svn20090913/po/ro.po 2011-02-27 18:49:34.000000000 +0100 +@@ -0,0 +1,71 @@ ++msgid "" ++msgstr "" ++"Project-Id-Version: LXDE\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: 2010-01-24 11:10-0800\n" ++"Last-Translator: alexxed \n" ++"Language-Team: Romanian \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " ++"20)) ? 1 : 2;\n" ++"X-Generator: Narro 0.9.4 on http://tradu.softwareliber.ro\n" ++ ++#: ../src/lxsession-edit.c:362 ++msgid "Enabled" ++msgstr "Activat" ++ ++#: ../src/lxsession-edit.c:367 ++msgid "Application" ++msgstr "Aplicație" ++ ++#: ../src/lxsession-edit.c:375 ++msgid "Comment" ++msgstr "Comentariu" ++ ++#: ../data/lxsession-edit.glade.h:1 ++msgid "" ++"Warning: Do NOT touch this unless you know exactly what you are " ++"doing.\n" ++"\n" ++"NOTE: This setting will take effect on next login." ++msgstr "" ++"Avertisment:NU modificați aceste valori decât dacă știți ce " ++"faceți.\n" ++"\n" ++"NOTĂ: Setarea va avea efect la următoarea autentificare." ++ ++#: ../data/lxsession-edit.glade.h:4 ++msgid "Advanced Options" ++msgstr "Opțiuni avansate" ++ ++#: ../data/lxsession-edit.glade.h:5 ++msgid "Applications automatically started after entering desktop:" ++msgstr "Aplicații pornite automat după intrarea în mediu de lucru:" ++ ++#: ../data/lxsession-edit.glade.h:6 ++msgid "Automatically Started Applications" ++msgstr "Aplicații pornite automat" ++ ++#: ../data/lxsession-edit.glade.h:7 ++msgid "" ++"Command line used to launch window manager\n" ++"(The default window manager command for LXDE should be openbox-lxde)" ++msgstr "" ++"Linia de comandă folosită pentru lansarea gestionarului de ferestre\n" ++"(Comanda implicită pentru gestionarul de ferestre LXDE ar trebui să fie " ++"openbox-lxde)" ++ ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 ++msgid "Desktop Session Settings" ++msgstr "Setări pentru sesiunea de lucru" ++ ++#: ../data/lxsession-edit.glade.h:10 ++msgid "Window Manager: " ++msgstr "Gestionar de ferestre: " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Gestionați aplicațiile încărcate în sesiunea de lucru" +Index: lxsession-edit-0.2.0~svn20090913/po/pa.po +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ lxsession-edit-0.2.0~svn20090913/po/pa.po 2011-02-27 18:49:34.000000000 +0100 +@@ -0,0 +1,74 @@ ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# ++# A S Alam , 2010. ++msgid "" ++msgstr "" ++"Project-Id-Version: \n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2010-10-09 06:07+0000\n" ++"PO-Revision-Date: 2010-10-10 08:09+0530\n" ++"Last-Translator: A S Alam \n" ++"Language-Team: Punjabi/Panjabi \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Lokalize 1.1\n" ++"Plural-Forms: nplurals=2; plural=n != 1;\n" ++ ++#: ../src/lxsession-edit.c:362 ++msgid "Enabled" ++msgstr "ਚਾਲੂ ਹੈ" ++ ++#: ../src/lxsession-edit.c:367 ++msgid "Application" ++msgstr "ਐਪਲੀਕੇਸ਼ਨ" ++ ++#: ../src/lxsession-edit.c:375 ++msgid "Comment" ++msgstr "ਟਿੱਪਣੀ" ++ ++#: ../data/lxsession-edit.glade.h:1 ++msgid "" ++"Warning: Do NOT touch this unless you know exactly what you " ++"are doing.\n" ++"\n" ++"NOTE: This setting will take effect on next login." ++msgstr "" ++"ਸਾਵਧਾਨ:ਜੇ ਤੁਹਾਨੂੰ ਇਹ ਪਤਾ ਨਾ ਹੋਵੇ ਕਿ ਤੁਸੀਂ ਕਰਨ ਜਾ ਰਹੇ ਹੋ ਤਾਂ ਕੁਝ " ++"ਨਾ ਕਰੋ।\n" ++"\n" ++"ਨੋਟ: ਇਹ ਸੈਟਿੰਗ ਅਗਲੀ ਵਾਰ ਲਾਗਇਨ ਕਰਨ ਦੇ ਸਮੇਂ ਪਰਭਾਵੀ ਹੋਵੇਗੀ।" ++ ++#: ../data/lxsession-edit.glade.h:4 ++msgid "Advanced Options" ++msgstr "ਤਕਨੀਕੀ ਚੋਣਾਂ" ++ ++#: ../data/lxsession-edit.glade.h:5 ++msgid "Applications automatically started after entering desktop:" ++msgstr "ਡੈਸਕਟਾਪ 'ਚ ਆਉਣ ਦੇ ਬਾਅਦ ਐਪਲੀਕੇਸ਼ਨ ਆਟੋਮੈਟਿਕ ਸ਼ੁਰੂ ਕੀਤੀਆਂ ਜਾਂਦੀਆਂ ਹਨ:" ++ ++#: ../data/lxsession-edit.glade.h:6 ++msgid "Automatically Started Applications" ++msgstr "ਆਟੋਮੈਟਿਕ ਸ਼ੁਰੂ ਐਪਲੀਕੇਸ਼ਨ" ++ ++#: ../data/lxsession-edit.glade.h:7 ++msgid "" ++"Command line used to launch window manager\n" ++"(The default window manager command for LXDE should be openbox-lxde)" ++msgstr "" ++"ਵਿੰਡੋ ਮੈਨੇਜਰ ਨੂੰ ਚਲਾਉਣ ਵਾਲੀ ਕਮਾਂਡ ਲਾਈਨ\n" ++"(LXDE ਲਈ ਡਿਫਾਲਟ ਵਿੰਡੋ ਮੈਨੇਜਰ openbox-lxde ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ)" ++ ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 ++msgid "Desktop Session Settings" ++msgstr "ਡੈਸਕਟਾਪ ਸ਼ੈਸ਼ਨ ਸੈਟਿੰਗ" ++ ++#: ../data/lxsession-edit.glade.h:10 ++msgid "Window Manager: " ++msgstr "ਵਿੰਡੋ ਮੈਨੇਜਰ: " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "ਡੈਸਕਟਾਪ ਸ਼ੈਸ਼ਨ ਵਿੱਚ ਲੋਡ ਹੋਣ ਵਾਲੀਆਂ ਐਪਲੀਕੇਸ਼ਨ ਦਾ ਪਰਬੰਧ" ++ +Index: lxsession-edit-0.2.0~svn20090913/po/hu.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/hu.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/hu.po 2011-02-27 18:49:34.000000000 +0100 +@@ -2,7 +2,7 @@ + msgstr "" + "Project-Id-Version: lxsession-edit\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" + "PO-Revision-Date: \n" + "Last-Translator: SZERVÁC Attila \n" + "Language-Team: Hungarian \n" +@@ -13,15 +13,15 @@ + "X-Poedit-Language: Hungarian\n" + "X-Poedit-Country: HUNGARY\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "Bekapcsolva" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "Alkalmazás" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "Megjegyzés" + +@@ -56,6 +56,7 @@ + "(Az alap LXDE ablakkezelő parancs az openbox-lxde )" + + #: ../data/lxsession-edit.glade.h:9 ++#: ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "Asztali folyamat beállításai" + +@@ -63,3 +64,7 @@ + msgid "Window Manager: " + msgstr "Ablakkezelő: " + ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Az asztali folyamat alkalmazásainak kezelése" ++ +Index: lxsession-edit-0.2.0~svn20090913/po/fr.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/fr.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/fr.po 2011-02-27 18:49:34.000000000 +0100 +@@ -2,12 +2,12 @@ + # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER + # This file is distributed under the same license as the PACKAGE package. + # FIRST AUTHOR , YEAR. +-# ++# + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" ++"POT-Creation-Date: 2010-02-18 04:06+0000\n" + "PO-Revision-Date: 2009-05-09 03:24+0200\n" + "Last-Translator: Cilyan Olowen \n" + "Language-Team: LANGUAGE \n" +@@ -16,27 +16,25 @@ + "Content-Transfer-Encoding: 8bit\n" + "X-Generator: Pootle 1.1.0\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "Activé" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "Application" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "Commentaire" + + #: ../data/lxsession-edit.glade.h:1 + msgid "" +-"Warning: Do NOT touch this unless you know exactly what you " +-"are doing.\n" ++"Warning: Do NOT touch this unless you know exactly what you are doing.\n" + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" +-"Avertissement : Ne touchez PAS ceci à moins que vous ne " +-"sachiez exactement ce que vous faites.\n" ++"Avertissement : Ne touchez PAS ceci à moins que vous ne sachiez exactement ce que vous faites.\n" + "\n" + "NOTE : Ce paramètre prendra effet à la prochaine connexion." + +@@ -60,10 +58,14 @@ + "Ligne de commande utilisée pour lancer le gestionnaire de fenêtres\n" + "(La commande par défaut pour LXDE devrait être openbox-lxde)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "Paramètres de la session" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " + msgstr "Gestionnaire de fenêtres : " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Gére les applications chargées dans la session" +Index: lxsession-edit-0.2.0~svn20090913/po/el.po +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ lxsession-edit-0.2.0~svn20090913/po/el.po 2011-02-27 18:49:34.000000000 +0100 +@@ -0,0 +1,76 @@ ++# SOME DESCRIPTIVE TITLE. ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# FIRST AUTHOR , YEAR. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: el\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: 2010-01-12 14:43+0100\n" ++"Last-Translator: George Vasilakos \n" ++"Language-Team: Greek\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Pootle 1.1.0\n" ++"X-Poedit-Language: Greek\n" ++"X-Poedit-Country: GREECE\n" ++ ++#: ../src/lxsession-edit.c:362 ++msgid "Enabled" ++msgstr "Ενεργοποιημένο" ++ ++#: ../src/lxsession-edit.c:367 ++msgid "Application" ++msgstr "Εφαρμογή" ++ ++#: ../src/lxsession-edit.c:375 ++msgid "Comment" ++msgstr "Σχόλιο" ++ ++#: ../data/lxsession-edit.glade.h:1 ++msgid "" ++"Warning: Do NOT touch this unless you know exactly what you " ++"are doing.\n" ++"\n" ++"NOTE: This setting will take effect on next login." ++msgstr "" ++"Προειδοποίηση: ΜΗΝ αγγίζετε αυτό εκτός αν ξέρετε καλά τι " ++"κάνετε.\n" ++"\n" ++"ΣΗΜΕΙΩΣΗ: Αυτή η ρύθμιση θα εφαρμοστεί μετά από επανασύνδεση." ++ ++#: ../data/lxsession-edit.glade.h:4 ++msgid "Advanced Options" ++msgstr "Προχωρημένες επιλογές" ++ ++#: ../data/lxsession-edit.glade.h:5 ++msgid "Applications automatically started after entering desktop:" ++msgstr "" ++"Εφαρμογές αυτόματα εκτελούμενες μετά την είσοδο στην επιφάνεια εργασίας:" ++ ++#: ../data/lxsession-edit.glade.h:6 ++msgid "Automatically Started Applications" ++msgstr "Αυτόματα εκτελούμενες εφαρμογές" ++ ++#: ../data/lxsession-edit.glade.h:7 ++msgid "" ++"Command line used to launch window manager\n" ++"(The default window manager command for LXDE should be openbox-lxde)" ++msgstr "" ++"Εντολή εκκίνησης διαχειριστή παραθύρων\n" ++"(Η προκαθορισμένη εντολή για το διαχειριστή του LXDE είναι openbox-lxde)" ++ ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 ++msgid "Desktop Session Settings" ++msgstr "Ρυθμίσεις συνεδρίας επιφάνειας εργασίας" ++ ++#: ../data/lxsession-edit.glade.h:10 ++msgid "Window Manager: " ++msgstr "Διαχειριστής παραθύρων:" ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Διαχείριση των φορτωμένων εφαρμογών στη συνεδρία" +Index: lxsession-edit-0.2.0~svn20090913/po/ru.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/ru.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/ru.po 2011-02-27 18:49:34.000000000 +0100 +@@ -2,43 +2,46 @@ + # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER + # This file is distributed under the same license as the PACKAGE package. + # FIRST AUTHOR , YEAR. +-# ++# + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" +-"PO-Revision-Date: 2009-04-25 07:43+0200\n" +-"Last-Translator: Александр Голубев \n" ++"POT-Creation-Date: 2010-03-18 04:10+0000\n" ++"PO-Revision-Date: 2010-09-03 14:23+0200\n" ++"Last-Translator: Max \n" + "Language-Team: LANGUAGE \n" ++"Language: ru\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"X-Generator: Pootle 1.1.0\n" ++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" ++"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" ++"X-Generator: Pootle 2.0.5\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "Доступно" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "Приложение" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "Комментарий" + + #: ../data/lxsession-edit.glade.h:1 + msgid "" +-"Warning: Do NOT touch this unless you know exactly what you " +-"are doing.\n" ++"Warning: Do NOT touch this unless you know exactly what you are doing.\n" + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" + "Осторожно: Не изменяйте этого, если Вы не знаете точно, что Вы " + "делаете.\n" + "\n" +-"ЗАМЕЧАНИЕ: Эти настройки будут использованы при следующем подключении" ++"ЗАМЕЧАНИЕ: Эти настройки будут использованы при следующем " ++"подключении." + + #: ../data/lxsession-edit.glade.h:4 + msgid "Advanced Options" +@@ -60,10 +63,14 @@ + "Команда запуска оконного менеджера\n" + " (По умолчанию используется openbox-lxde)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "Сессионные настройки рабочего стола" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " +-msgstr "Оконный менеджер:_" ++msgstr "Оконный менеджер: " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Управление приложениями загруженными в сессии рабочего стола" +Index: lxsession-edit-0.2.0~svn20090913/po/ur.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/ur.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/ur.po 2011-02-27 18:49:34.000000000 +0100 +@@ -7,7 +7,7 @@ + msgstr "" + "Project-Id-Version: lxsession-edit\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" + "PO-Revision-Date: 2009-05-10 03:42+0500\n" + "Last-Translator: Muhammad Ali Makki \n" + "Language-Team: Urdu \n" +@@ -19,25 +19,27 @@ + "X-Poedit-Country: PAKISTAN\n" + "X-Poedit-SourceCharset: utf-8\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "فعال" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "اطلاقیہ" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "تبصرہ" + + #: ../data/lxsession-edit.glade.h:1 + msgid "" +-"Warning: Do NOT touch this unless you know exactly what you are doing.\n" ++"Warning: Do NOT touch this unless you know exactly what you " ++"are doing.\n" + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" +-"انتباہ: انہیں مت چھیڑیںجب تک کہ آپ کو پختہ طور پر یہ معلوم نہ ہو کہ آپ کیا کرنے جارہے ہیں.\n" ++"انتباہ: انہیں مت چھیڑیںجب تک کہ آپ کو پختہ طور پر یہ معلوم نہ " ++"ہو کہ آپ کیا کرنے جارہے ہیں.\n" + "\n" + "نوٹ: ان تبدیلیوں کا اطلاق اگلی بار لاگ ان پر ہوگا." + +@@ -61,7 +63,7 @@ + "ونڈو منیجر کو چلانے کے لیے استعمال ہونے والی کمانڈ لائن\n" + "(طے شدہ ونڈو منیجر کی کمانڈ برائے ایل ایکس ڈی ای openbox-lxde ہونی چاہیے)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "ڈیسک ٹاپ نشست ترتیبات" + +@@ -69,3 +71,6 @@ + msgid "Window Manager: " + msgstr "ونڈو منیجر:" + ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "" +Index: lxsession-edit-0.2.0~svn20090913/po/fo.po +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ lxsession-edit-0.2.0~svn20090913/po/fo.po 2011-02-27 18:49:34.000000000 +0100 +@@ -0,0 +1,75 @@ ++# SOME DESCRIPTIVE TITLE. ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# FIRST AUTHOR , YEAR. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: 2010-04-18 00:18+0200\n" ++"Last-Translator: Gunleif \n" ++"Language-Team: LANGUAGE \n" ++"Language: fo\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++"X-Generator: Pootle 2.0.1\n" ++ ++#: ../src/lxsession-edit.c:362 ++msgid "Enabled" ++msgstr "Gilda" ++ ++#: ../src/lxsession-edit.c:367 ++msgid "Application" ++msgstr "Nýtsluskipan" ++ ++#: ../src/lxsession-edit.c:375 ++msgid "Comment" ++msgstr "Viðmerking" ++ ++#: ../data/lxsession-edit.glade.h:1 ++msgid "" ++"Warning: Do NOT touch this unless you know exactly what you " ++"are doing.\n" ++"\n" ++"NOTE: This setting will take effect on next login." ++msgstr "" ++"Ávaring: BROYT EINKI um tú ikki nágreinliga veitst hvat ið tú " ++"gerð.\n" ++"\n" ++"Gev gætur: Henda seting tekur við, eftir næstu innritan." ++ ++#: ../data/lxsession-edit.glade.h:4 ++msgid "Advanced Options" ++msgstr "Framkomnir kostir" ++ ++#: ../data/lxsession-edit.glade.h:5 ++msgid "Applications automatically started after entering desktop:" ++msgstr "Nýtsluskipanir ið sjálvvirknar byrja, eftir at skriviborðið byrjar:" ++ ++#: ../data/lxsession-edit.glade.h:6 ++msgid "Automatically Started Applications" ++msgstr "Nýtsluskipanir ið sjálvvirknar byrja" ++ ++#: ../data/lxsession-edit.glade.h:7 ++msgid "" ++"Command line used to launch window manager\n" ++"(The default window manager command for LXDE should be openbox-lxde)" ++msgstr "" ++"Stýriboð nýtt at byrja gluggaleiðara við\n" ++"(Forsett stýriboð hjá LXDE átti at verið openbox-lxde)" ++ ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 ++msgid "Desktop Session Settings" ++msgstr "Setingar á skriviborðssetu" ++ ++#: ../data/lxsession-edit.glade.h:10 ++msgid "Window Manager: " ++msgstr "Glugga fyrisiti: " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Umsit nýtsluskipanir ið eru løddar í skriviborðssetuni" +Index: lxsession-edit-0.2.0~svn20090913/po/ar.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/ar.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/ar.po 2011-02-27 18:49:34.000000000 +0100 +@@ -2,28 +2,29 @@ + # Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER + # This file is distributed under the same license as the PACKAGE package. + # أحمد فرغل , 2009. ++# Tareq Al Jurf , 2010. + # + msgid "" + msgstr "" + "Project-Id-Version: LXSession-edit\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" +-"PO-Revision-Date: 2009-01-26 20:30+0200\n" +-"Last-Translator: Ahmad Farghal \n" +-"Language-Team: Arabic\n" ++"POT-Creation-Date: 2010-04-20 04:13+0000\n" ++"PO-Revision-Date: 2010-04-20 19:45+0300\n" ++"Last-Translator: Tareq Al Jurf \n" ++"Language-Team: Arabic \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "مُمَكّن" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "التطبيق" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "التعليق" + +@@ -58,10 +59,14 @@ + "سطر الأوامر المستخدم لتشغيل مدير النوافد\n" + "(أمر مدير النوافذ المبدئي لـLXDE هو openbox-lxde)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "إعدادات جلسة سطح المكتب" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " + msgstr "مدير النوافذ:" ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "أدِر التطبيقات المحملة في جلسة سطح المكتب" +Index: lxsession-edit-0.2.0~svn20090913/po/ast.po +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ lxsession-edit-0.2.0~svn20090913/po/ast.po 2011-02-27 18:49:34.000000000 +0100 +@@ -0,0 +1,77 @@ ++# Asturian translation of lxsession-edit ++# Copyright (C) 2008 THE lxsession-edit'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the lxsession-edit package. ++# ++# Iñigo Varela , 2010. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: lxsession-edit\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2010-05-09 04:14+0000\n" ++"PO-Revision-Date: 2010-05-09 17:11+0100\n" ++"Last-Translator: astur \n" ++"Language-Team: Asturian \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Language: ast\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++"X-Generator: Pootle 2.0.1\n" ++"X-Poedit-Language: Asturian\n" ++ ++#: ../src/lxsession-edit.c:362 ++msgid "Enabled" ++msgstr "Activáu" ++ ++#: ../src/lxsession-edit.c:367 ++msgid "Application" ++msgstr "Aplicación" ++ ++#: ../src/lxsession-edit.c:375 ++msgid "Comment" ++msgstr "Comentariu" ++ ++#: ../data/lxsession-edit.glade.h:1 ++msgid "" ++"Warning: Do NOT touch this unless you know exactly what you are doing.\n" ++"\n" ++"NOTE: This setting will take effect on next login." ++msgstr "" ++"Alvertencia: NUN modifiques esto, sacantes que sepas esautamente lo que faes.\n" ++"\n" ++"NOTA: Esti axuste fadrá efeutu nel siguiente aniciu de sesión." ++ ++#: ../data/lxsession-edit.glade.h:4 ++msgid "Advanced Options" ++msgstr "Opciones avanzaes" ++ ++#: ../data/lxsession-edit.glade.h:5 ++msgid "Applications automatically started after entering desktop:" ++msgstr "Aplicaciones aniciaes automáticamente tres d'entrar al escritoriu:" ++ ++#: ../data/lxsession-edit.glade.h:6 ++msgid "Automatically Started Applications" ++msgstr "Aniciar automáticamente les aplicaciones" ++ ++#: ../data/lxsession-edit.glade.h:7 ++msgid "" ++"Command line used to launch window manager\n" ++"(The default window manager command for LXDE should be openbox-lxde)" ++msgstr "" ++"La llinia de comandos usada pa llanzar el xestor de ventanes\n" ++"(El programa de llinia de comandos de LXDE por omisión tendría de ser openbox-lxde)" ++ ++#: ../data/lxsession-edit.glade.h:9 ++#: ../lxsession-edit.desktop.in.h:1 ++msgid "Desktop Session Settings" ++msgstr "Configuración de la sesión d'escritoriu" ++ ++#: ../data/lxsession-edit.glade.h:10 ++msgid "Window Manager: " ++msgstr "Xestor de ventanes: " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Xestiona les aplicaciones cargaes na sesión d'escritoriu" ++ +Index: lxsession-edit-0.2.0~svn20090913/po/he.po +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ lxsession-edit-0.2.0~svn20090913/po/he.po 2011-02-27 18:49:34.000000000 +0100 +@@ -0,0 +1,74 @@ ++# SOME DESCRIPTIVE TITLE. ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# FIRST AUTHOR , YEAR. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: 2010-01-13 23:25+0200\n" ++"Last-Translator: Yaron Shahrbani \n" ++"Language-Team: LANGUAGE \n" ++"Language: he\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++"X-Generator: Pootle 2.0.0\n" ++ ++#: ../src/lxsession-edit.c:362 ++msgid "Enabled" ++msgstr "פעיל" ++ ++#: ../src/lxsession-edit.c:367 ++msgid "Application" ++msgstr "יישום" ++ ++#: ../src/lxsession-edit.c:375 ++msgid "Comment" ++msgstr "הערה" ++ ++#: ../data/lxsession-edit.glade.h:1 ++msgid "" ++"Warning: Do NOT touch this unless you know exactly what you " ++"are doing.\n" ++"\n" ++"NOTE: This setting will take effect on next login." ++msgstr "" ++"אזהרה: אין בזה אלא אם כן יש לך מושג במעשיך.\n" ++"\n" ++"הערה: הגדרות אלו יחלו עם הכניסה הבאה למערכת." ++ ++#: ../data/lxsession-edit.glade.h:4 ++msgid "Advanced Options" ++msgstr "אפשרויות מתקדמות" ++ ++#: ../data/lxsession-edit.glade.h:5 ++msgid "Applications automatically started after entering desktop:" ++msgstr "היישומים שמופעלים אוטומטית לאחר הכניסה לשולחן העבודה:" ++ ++#: ../data/lxsession-edit.glade.h:6 ++msgid "Automatically Started Applications" ++msgstr "יישומים שמופעלים אוטומטית" ++ ++#: ../data/lxsession-edit.glade.h:7 ++msgid "" ++"Command line used to launch window manager\n" ++"(The default window manager command for LXDE should be openbox-lxde)" ++msgstr "" ++"שורת הפקודה המשמשת לטעינת מנהל החלונות\n" ++"(פקודת מנהל החלונות כברירת המחדל עבור LXDE אמורה להיות openbox-lxde)" ++ ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 ++msgid "Desktop Session Settings" ++msgstr "הגדרות השימוש בשולחן העבודה" ++ ++#: ../data/lxsession-edit.glade.h:10 ++msgid "Window Manager: " ++msgstr "מנהל החלונות: " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "ניהול יישומים הנטענים עם עליית שולחן העבודה" +Index: lxsession-edit-0.2.0~svn20090913/po/pt.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/pt.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/pt.po 2011-02-27 18:49:34.000000000 +0100 +@@ -1,14 +1,14 @@ + # Portuguese translation of lxsession-edit + # Copyright (C) 2009, THE lxsession-edit COPYRIGHT HOLDER + # This file is distributed under the same license as the lxsession-edit package. +-# Sérgio Marques , 2009 +-# ++# Sérgio Marques 2009-2010 ++# Adaptado ao acordo ortográfico de 1990 + msgid "" + msgstr "" +-"Project-Id-Version: lxsessionedit 0.1\n" ++"Project-Id-Version: lxsessionedit\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" +-"PO-Revision-Date: 2009-05-05 15:43-0000\n" ++"POT-Creation-Date: 2010-02-15 04:06+0000\n" ++"PO-Revision-Date: 2010-09-22 11:37-0000\n" + "Last-Translator: Sérgio Marques \n" + "Language-Team: Portuguese\n" + "MIME-Version: 1.0\n" +@@ -19,15 +19,15 @@ + "X-Poedit-SourceCharset: utf-8\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" +-msgstr "Activado" ++msgstr "Ativo" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "Aplicação" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "Comentário" + +@@ -37,13 +37,13 @@ + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" +-"Aviso: NÃO mexa aqui a menos que saiba exactamente o que está a fazer.\n" ++"Aviso: Não MEXA aqui a menos que saiba exatamente o que está a fazer.\n" + "\n" + "NOTA: Esta definição produzirá efeitos no próximo início de sessão." + + #: ../data/lxsession-edit.glade.h:4 + msgid "Advanced Options" +-msgstr "Opções Avançadas" ++msgstr "Opções avançadas" + + #: ../data/lxsession-edit.glade.h:5 + msgid "Applications automatically started after entering desktop:" +@@ -51,23 +51,26 @@ + + #: ../data/lxsession-edit.glade.h:6 + msgid "Automatically Started Applications" +-msgstr "Aplicações Iniciadas Automaticamente" ++msgstr "Aplicações iniciadas automaticamente" + + #: ../data/lxsession-edit.glade.h:7 + msgid "" + "Command line used to launch window manager\n" + "(The default window manager command for LXDE should be openbox-lxde)" + msgstr "" +-"Linha de comandos para lançar gestor de janelas\n" +-"(O gestor de janelas padrão do LXDE deve ser openbox-lxde)" ++"Linha de comandos para iniciar o gestor de janelas\n" ++"(O gestor de janelas por omissão do LXDE deve ser openbox-lxde)" + + #: ../data/lxsession-edit.glade.h:9 ++#: ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" +-msgstr "Definições da Sessão" ++msgstr "Definições da sessão" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " +-msgstr "Gestor de Janelas:" ++msgstr "Gestor de janelas:" + ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Gestão das aplicações carregadas pela sessão" + +- +Index: lxsession-edit-0.2.0~svn20090913/po/be.po +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ lxsession-edit-0.2.0~svn20090913/po/be.po 2011-02-27 18:49:34.000000000 +0100 +@@ -0,0 +1,76 @@ ++# SOME DESCRIPTIVE TITLE. ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# FIRST AUTHOR , YEAR. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: 2010-08-25 13:35+0200\n" ++"Last-Translator: Анік \n" ++"Language-Team: LANGUAGE \n" ++"Language: be\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" ++"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" ++"X-Generator: Pootle 2.0.5\n" ++ ++#: ../src/lxsession-edit.c:362 ++msgid "Enabled" ++msgstr "Уключана" ++ ++#: ../src/lxsession-edit.c:367 ++msgid "Application" ++msgstr "Праграма" ++ ++#: ../src/lxsession-edit.c:375 ++msgid "Comment" ++msgstr "Каментар" ++ ++#: ../data/lxsession-edit.glade.h:1 ++msgid "" ++"Warning: Do NOT touch this unless you know exactly what you " ++"are doing.\n" ++"\n" ++"NOTE: This setting will take effect on next login." ++msgstr "" ++"Увага: Не змяняйце гэта, калі Вы дакладна не ведаеце, што Вы " ++"робіце.\n" ++"\n" ++"Заўвага: Гэтыя налады набудуць моц пры настым уваходзе сістэму." ++ ++#: ../data/lxsession-edit.glade.h:4 ++msgid "Advanced Options" ++msgstr "Дадатковыя опцыі" ++ ++#: ../data/lxsession-edit.glade.h:5 ++msgid "Applications automatically started after entering desktop:" ++msgstr "Праграмы, якія аўтаматычна запускаюцца пасля ўваходу" ++ ++#: ../data/lxsession-edit.glade.h:6 ++msgid "Automatically Started Applications" ++msgstr "Праграмы, якія аўтаматычна запускаюцца" ++ ++#: ../data/lxsession-edit.glade.h:7 ++msgid "" ++"Command line used to launch window manager\n" ++"(The default window manager command for LXDE should be openbox-lxde)" ++msgstr "" ++"Загадны радок для запуску аконнага мэнэджэра\n" ++"(Па змоўчаньні аконным мэнэджэрам LXDE павінен быць openbox-lxde)" ++ ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 ++msgid "Desktop Session Settings" ++msgstr "Налады сесіі працоўнага стала" ++ ++#: ../data/lxsession-edit.glade.h:10 ++msgid "Window Manager: " ++msgstr "Аконны мэнэджар:" ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Кіраванне праграмамі, якія загружаюцца ў настольнай сесіі." +Index: lxsession-edit-0.2.0~svn20090913/po/eu.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/eu.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/eu.po 2011-02-27 18:49:34.000000000 +0100 +@@ -2,7 +2,7 @@ + msgstr "" + "Project-Id-Version: lxsession-edit\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" + "PO-Revision-Date: \n" + "Last-Translator: Alain Mendizabal \n" + "Language-Team: Basque \n" +@@ -12,15 +12,15 @@ + "X-Poedit-Language: Basque\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\\n\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "Gaituta" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "Aplikazioa" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "Iruzkina" + +@@ -55,10 +55,14 @@ + "Leiho kudeatzailea exekutatzeko komando-lerroa\n" + "(LXDE-rako komando lehenetsia openbox-lxde da)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "Idazmahai-saioaren ezarpenak" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " + msgstr "Leiho kudeatzailea:" ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "" +Index: lxsession-edit-0.2.0~svn20090913/po/it.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/it.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/it.po 2011-02-27 18:49:34.000000000 +0100 +@@ -7,26 +7,28 @@ + msgstr "" + "Project-Id-Version: lxsession-edit 0.1\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" +-"PO-Revision-Date: 2009-04-17 19:30+0200\n" +-"Last-Translator: Alessandro Pellizzari \n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: 2010-01-17 18:07+0200\n" ++"Last-Translator: Andrea \n" + "Language-Team: \n" ++"Language: it\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"X-Generator: Pootle 1.1.0\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++"X-Generator: Pootle 2.0.0\n" + "X-Poedit-Language: Italian\n" + "X-Poedit-Country: ITALY\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "Attivato" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "Applicazione" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "Commento" + +@@ -61,10 +63,15 @@ + "Linea di comando usata per avviare il gestore di finestre\n" + "(Il gestore di finestre standard per LXDE dovrebbe essere openbox-lxde)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "Impostazioni della sessione" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " + msgstr "Gestore di finestre: " ++ ++# ho ignorato "desktop" così come avevate fatto nella stringa 8 ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Gestisce le applicazioni avviate nella sessione" +Index: lxsession-edit-0.2.0~svn20090913/po/sk.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/sk.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/sk.po 2011-02-27 18:49:34.000000000 +0100 +@@ -7,35 +7,33 @@ + msgstr "" + "Project-Id-Version: lxsesion-edit\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" +-"PO-Revision-Date: 2009-02-13 14:53+0100\n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: 2010-01-16 19:21+0100\n" + "Last-Translator: Ivan Masár \n" + "Language-Team: Slovak \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "Zapnuté" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "Aplikácia" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "Komentár" + + #: ../data/lxsession-edit.glade.h:1 + msgid "" +-"Warning: Do NOT touch this unless you know exactly what you " +-"are doing.\n" ++"Warning: Do NOT touch this unless you know exactly what you are doing.\n" + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" +-"Upozornenie: Nedotýkajte sa tohto ak si nie ste presne istý, " +-"čo robíte.\n" ++"Upozornenie: Nedotýkajte sa tohto ak si nie ste presne istý, čo robíte.\n" + "\n" + "Pozn.: Táto voľba sa prejaví pri ďalšom prihlásení." + +@@ -60,9 +58,15 @@ + "(Štandardný príkaz správcu okien pre LXDE by mal byť openbox-lxde)" + + #: ../data/lxsession-edit.glade.h:9 ++#: ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "Nastavenia relácie plochy" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " + msgstr "Správca okien: " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Správa aplikácií nahraných v relácii pracovného prostredia" ++ +Index: lxsession-edit-0.2.0~svn20090913/po/gl.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/gl.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/gl.po 2011-02-27 18:49:34.000000000 +0100 +@@ -3,30 +3,32 @@ + # This file is distributed under the same license as the PACKAGE package. + # FIRST AUTHOR , YEAR. + # +-#, fuzzy + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" +-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +-"Last-Translator: FULL NAME \n" +-"Language-Team: LANGUAGE \n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: 2010-03-09 12:24+0200\n" ++"Last-Translator: Indalecio \n" ++"Language-Team: Proxecto Trasno \n" ++"Language: gl\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++"X-Generator: Pootle 2.0.1\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" +-msgstr "" ++msgstr "Activado" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" +-msgstr "" ++msgstr "Aplicación" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" +-msgstr "" ++msgstr "Comentario" + + #: ../data/lxsession-edit.glade.h:1 + msgid "" +@@ -35,29 +37,40 @@ + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" ++"Advertencia: NON edite isto, a menos que saiba exactamente o " ++"que está facendo.\n" ++"\n" ++"NOTA: Este axuste terá efecto a próxima vez que inicie sesión." + + #: ../data/lxsession-edit.glade.h:4 + msgid "Advanced Options" +-msgstr "" ++msgstr "Opcións avanzadas" + + #: ../data/lxsession-edit.glade.h:5 + msgid "Applications automatically started after entering desktop:" + msgstr "" ++"Aplicacións que inician automaticamente despois de entrar no escritorio:" + + #: ../data/lxsession-edit.glade.h:6 + msgid "Automatically Started Applications" +-msgstr "" ++msgstr "Iniciar automaticamente as aplicacións" + + #: ../data/lxsession-edit.glade.h:7 + msgid "" + "Command line used to launch window manager\n" + "(The default window manager command for LXDE should be openbox-lxde)" + msgstr "" ++"A liña de ordes utilizada para lanzar o xestor de xanelas\n" ++"(O aplicativo de liña de ordes de LXDE por omisión debería ser openbox-lxde)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" +-msgstr "" ++msgstr "Configuración da sesión de escritorio" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " +-msgstr "" ++msgstr "Xestor de xanelas: " ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Xestionar os aplicativos cargados na sesión de escritorio" +Index: lxsession-edit-0.2.0~svn20090913/po/cs.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/cs.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/cs.po 2011-02-27 18:49:34.000000000 +0100 +@@ -7,24 +7,26 @@ + msgstr "" + "Project-Id-Version: lxsession-edit 0.1\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" +-"PO-Revision-Date: 2009-02-02 01:56+0100\n" +-"Last-Translator: Michal Várady \n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: 2010-03-29 22:53+0200\n" ++"Last-Translator: \n" + "Language-Team: Czech\n" ++"Language: cs\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" ++"X-Generator: Pootle 2.0.1\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "Povoleno" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "Aplikace" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "Poznámka" + +@@ -61,10 +63,14 @@ + "(Výchozí příkaz pro spuštění správce oken prostředí LXDE by měl být openbox-" + "lxde)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "Nastavení relace pracovního prostředí" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " + msgstr "Správce oken:" ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Spravuje aplikace spuštěné v relaci pracovní plochy" +Index: lxsession-edit-0.2.0~svn20090913/po/sr.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/sr.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/sr.po 2011-02-27 18:49:34.000000000 +0100 +@@ -2,13 +2,13 @@ + # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER + # This file is distributed under the same license as the LXSession-Edit package. + # Jay A. Fleming , 2009. +-# +-# ++# ++# + msgid "" + msgstr "" + "Project-Id-Version: LXSession-Edit x\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" ++"POT-Creation-Date: 2010-05-27 04:23+0000\n" + "PO-Revision-Date: 2009-08-31 12:59+0100\n" + "Last-Translator: Jay A. Fleming \n" + "Language-Team: \n" +@@ -17,22 +17,21 @@ + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "Омогућено" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "Програм" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "Примедба" + + #: ../data/lxsession-edit.glade.h:1 + msgid "" +-"Warning: Do NOT touch this unless you know exactly what you " +-"are doing.\n" ++"Warning: Do NOT touch this unless you know exactly what you are doing.\n" + "\n" + "NOTE: This setting will take effect on next login." + msgstr "" +@@ -60,7 +59,7 @@ + "Наредба за покретање Управљача прозора\n" + "(Подразумевана наредба за LXDE би била „openbox-lxde“)" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "Подесите ваше сесије" + +@@ -68,4 +67,6 @@ + msgid "Window Manager: " + msgstr "Управљача прозорима: " + +- ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Управљање апликацијама учитаним у сесију радне површи" +Index: lxsession-edit-0.2.0~svn20090913/po/bn_IN.po +=================================================================== +--- lxsession-edit-0.2.0~svn20090913.orig/po/bn_IN.po 2011-02-27 18:57:58.000000000 +0100 ++++ lxsession-edit-0.2.0~svn20090913/po/bn_IN.po 2011-02-27 18:49:34.000000000 +0100 +@@ -7,7 +7,7 @@ + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-15 19:47+0200\n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" + "PO-Revision-Date: 2009-07-28 11:54+0200\n" + "Last-Translator: Sankarshan \n" + "Language-Team: LANGUAGE \n" +@@ -16,15 +16,15 @@ + "Content-Transfer-Encoding: 8bit\n" + "X-Generator: Pootle 1.1.0\n" + +-#: ../src/lxsession-edit.c:360 ++#: ../src/lxsession-edit.c:362 + msgid "Enabled" + msgstr "সক্রিয়" + +-#: ../src/lxsession-edit.c:365 ++#: ../src/lxsession-edit.c:367 + msgid "Application" + msgstr "অ্যাপ্লিকেশন" + +-#: ../src/lxsession-edit.c:373 ++#: ../src/lxsession-edit.c:375 + msgid "Comment" + msgstr "বিবৃতি" + +@@ -56,10 +56,14 @@ + "উইন্ডো ম্যানেজার লঞ্চ করার জন্য ব্যবহৃত কম্যান্ড লাইন\n" + "(openbox-lxde হল LXDE-এর ডিফল্ট উইন্ডো ম্যানেজার কম্যান্ড )" + +-#: ../data/lxsession-edit.glade.h:9 ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 + msgid "Desktop Session Settings" + msgstr "ডেস্কটপ সেশানের বিবিধ বৈশিষ্ট্য" + + #: ../data/lxsession-edit.glade.h:10 + msgid "Window Manager: " + msgstr "উইন্ডো ম্যানেজার:" ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "" +Index: lxsession-edit-0.2.0~svn20090913/po/ca.po +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ lxsession-edit-0.2.0~svn20090913/po/ca.po 2011-02-27 18:49:34.000000000 +0100 +@@ -0,0 +1,77 @@ ++# lxsession-edit.po CATALAN TRANSLATION ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# FIRST AUTHOR , YEAR. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2010-01-12 01:19+0100\n" ++"PO-Revision-Date: 2010-01-13 23:09+0200\n" ++"Last-Translator: Josep Sanchez \n" ++"Language-Team: LXDE Catalan translators group\n" ++"Language: ca\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++"X-Generator: Pootle 2.0.0\n" ++ ++#: ../src/lxsession-edit.c:362 ++msgid "Enabled" ++msgstr "Habilitat" ++ ++#: ../src/lxsession-edit.c:367 ++msgid "Application" ++msgstr "Aplicació" ++ ++#: ../src/lxsession-edit.c:375 ++msgid "Comment" ++msgstr "Comentari" ++ ++#: ../data/lxsession-edit.glade.h:1 ++msgid "" ++"Warning: Do NOT touch this unless you know exactly what you " ++"are doing.\n" ++"\n" ++"NOTE: This setting will take effect on next login." ++msgstr "" ++"Avís: NO toqueu això a no ser que sapigueu exactament el que " ++"esteu fent.\n" ++"\n" ++"NOTA: aquest paràmetre tindrà efecte a la propera entrada al sistema." ++ ++#: ../data/lxsession-edit.glade.h:4 ++msgid "Advanced Options" ++msgstr "Opcions avançades" ++ ++#: ../data/lxsession-edit.glade.h:5 ++msgid "Applications automatically started after entering desktop:" ++msgstr "" ++"Aplicacions que s'engegaran automàticament un cop hagueu entrat a " ++"l'escriptori:" ++ ++#: ../data/lxsession-edit.glade.h:6 ++msgid "Automatically Started Applications" ++msgstr "Aplicacions engegades automàticament" ++ ++#: ../data/lxsession-edit.glade.h:7 ++msgid "" ++"Command line used to launch window manager\n" ++"(The default window manager command for LXDE should be openbox-lxde)" ++msgstr "" ++"Intérpret d'ordres emprat per a invocar el gestor de finestres\n" ++"(L'ordre predeterminada per a LXDE hauria de ser openbox-lxde)" ++ ++#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 ++msgid "Desktop Session Settings" ++msgstr "Paràmetres de la sessió d'escriptori" ++ ++#: ../data/lxsession-edit.glade.h:10 ++msgid "Window Manager: " ++msgstr "Gestor de finestres" ++ ++#: ../lxsession-edit.desktop.in.h:2 ++msgid "Manage applications loaded in desktop session" ++msgstr "Gestioneu els programes que es carreguen a la sessió d'escriptori" diff -Nru lxsession-edit-0.2.0/debian/patches/series lxsession-edit-0.2.0~svn20090913/debian/patches/series --- lxsession-edit-0.2.0/debian/patches/series 2012-03-23 20:23:49.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/debian/patches/series 2011-02-27 18:18:21.000000000 +0000 @@ -1 +1,3 @@ -01_fix_session_name.patch +02-read-XDG_CURRENT_DESKTOP.patch +03_enable_desktop_translations.patch +80_translations.patch diff -Nru lxsession-edit-0.2.0/debian/rules lxsession-edit-0.2.0~svn20090913/debian/rules --- lxsession-edit-0.2.0/debian/rules 2011-07-24 16:16:10.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/debian/rules 2011-02-27 17:56:53.000000000 +0000 @@ -1,5 +1,104 @@ #!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -%: - dh $@ +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) +CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +else +CROSS= --build $(DEB_BUILD_GNU_TYPE) +endif + +config.status: configure + dh_testdir + # Add here commands to configure the package. +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + /usr/bin/autoreconf -fiv + ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" + + +build: build-stamp + +build-stamp: config.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + #docbook-to-man debian/lxsession-edit.sgml > lxsession-edit.1 + + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean + rm -f config.sub config.guess + rm -f po/*.gmo + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + # Add here commands to install the package into debian/lxsession-edit. + $(MAKE) DESTDIR=$(CURDIR)/debian/lxsession-edit install + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples +# dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_python +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install diff -Nru lxsession-edit-0.2.0/debian/source/options lxsession-edit-0.2.0~svn20090913/debian/source/options --- lxsession-edit-0.2.0/debian/source/options 2011-07-24 16:19:30.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/debian/source/options 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -compression = "bzip2" -compression-level = 9 diff -Nru lxsession-edit-0.2.0/debian/watch lxsession-edit-0.2.0~svn20090913/debian/watch --- lxsession-edit-0.2.0/debian/watch 2011-07-24 16:16:10.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/debian/watch 2011-02-27 17:52:49.000000000 +0000 @@ -1,2 +1,11 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 3 file version=3 + +# Uncomment to find new files on sourceforge, for devscripts >= 2.9 http://sf.net/lxde/lxsession-edit-(.*)\.tar\.gz + diff -Nru lxsession-edit-0.2.0/depcomp lxsession-edit-0.2.0~svn20090913/depcomp --- lxsession-edit-0.2.0/depcomp 2011-07-19 20:18:17.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/depcomp 2009-09-13 11:06:52.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2007-03-29.01 -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# 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 # it under the terms of the GNU General Public License as published by @@ -17,7 +17,9 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# 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 @@ -85,15 +87,6 @@ depmode=dashmstdout fi -cygpath_u="cygpath -u -f -" -if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" - depmode=msvisualcpp -fi - case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -199,14 +192,14 @@ ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ tr ' -' ' ' >> "$depfile" - echo >> "$depfile" +' ' ' >> $depfile + echo >> $depfile # The second pass generates a dummy entry for each header file. tr ' ' ' ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + >> $depfile else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -335,12 +328,7 @@ if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" # Add `dependent.h:' lines. - sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi @@ -416,7 +404,7 @@ # Remove the call to Libtool. if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do + while test $1 != '--mode=compile'; do shift done shift @@ -467,39 +455,32 @@ "$@" || exit $? # Remove any Libtool call if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do + while test $1 != '--mode=compile'; do shift done shift fi # X makedepend shift - cleared=no eat=no - for arg - do + cleared=no + for arg in "$@"; do case $cleared in no) set ""; shift cleared=yes ;; esac - if test $eat = yes; then - eat=no - continue - fi case "$arg" in -D*|-I*) set fnord "$@" "$arg"; shift ;; # Strip any option that makedepend may not understand. Remove # the object too, otherwise makedepend will parse it as a source file. - -arch) - eat=yes ;; -*|$object) ;; *) set fnord "$@" "$arg"; shift ;; esac done - obj_suffix=`echo "$object" | sed 's/^.*\././'` + obj_suffix="`echo $object | sed 's/^.*\././'`" touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" @@ -519,7 +500,7 @@ # Remove the call to Libtool. if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do + while test $1 != '--mode=compile'; do shift done shift @@ -557,27 +538,13 @@ msvisualcpp) # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. + # always write the preprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - IFS=" " for arg do case "$arg" in - -o) - shift - ;; - $object) - shift - ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") set fnord "$@" shift @@ -590,23 +557,16 @@ ;; esac done - "$@" -E 2>/dev/null | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" + "$@" -E | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" echo " " >> "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; -msvcmsys) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - none) exec "$@" ;; @@ -625,6 +585,5 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" +# time-stamp-end: "$" # End: diff -Nru lxsession-edit-0.2.0/install-sh lxsession-edit-0.2.0~svn20090913/install-sh --- lxsession-edit-0.2.0/install-sh 2011-07-19 20:18:17.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/install-sh 2009-09-13 11:06:51.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +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 @@ -515,6 +515,5 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" +# time-stamp-end: "$" # End: diff -Nru lxsession-edit-0.2.0/ltmain.sh lxsession-edit-0.2.0~svn20090913/ltmain.sh --- lxsession-edit-0.2.0/ltmain.sh 2011-07-19 20:18:16.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/ltmain.sh 2009-09-13 11:06:51.000000000 +0000 @@ -1,9 +1,9 @@ +# Generated from ltmain.m4sh. -# libtool (GNU libtool) 2.4 +# ltmain.sh (GNU libtool) 2.2.6 # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 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. @@ -32,56 +32,50 @@ # # Provide generalized library-building support services. # -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message +# --config show all configuration variables +# --debug enable verbose shell tracing +# -n, --dry-run display commands without modifying any files +# --features display basic configuration information and exit +# --mode=MODE use operation mode MODE +# --preserve-dup-deps don't remove duplicate dependency libraries +# --quiet, --silent don't print informational messages +# --tag=TAG use configuration variables from tag TAG +# -v, --verbose print informational messages (default) +# --version print version information +# -h, --help print short or long help message # # MODE must be one of the following: # -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory +# clean remove files from the build directory +# compile compile a source file into a libtool object +# execute automatically set library path, then run a program +# finish complete the installation of libtool libraries +# install install libraries or executables +# link create a library or an executable +# uninstall remove libraries from an installed directory # -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. +# MODE-ARGS vary depending on the MODE. # Try `$progname --help --mode=MODE' for a more detailed description of MODE. # # When reporting a bug, please describe a test case to reproduce it and # include the following information: # -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4 Debian-2.4-2 -# automake: $automake_version -# autoconf: $autoconf_version +# host-triplet: $host +# shell: $SHELL +# compiler: $LTCC +# compiler flags: $LTCFLAGS +# linker: $LD (gnu? $with_gnu_ld) +# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-1ubuntu1 +# automake: $automake_version +# autoconf: $autoconf_version # # Report bugs to . -# GNU libtool home page: . -# General help using GNU software: . -PROGRAM=libtool +PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="2.4 Debian-2.4-2" +VERSION="2.2.6 Debian-2.2.6a-1ubuntu1" TIMESTAMP="" -package_revision=1.3293 +package_revision=1.3012 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -97,15 +91,10 @@ BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} - # NLS nuisances: We save the old values to restore during execute mode. +# Only set LANG and LC_ALL to C if already set. +# These must not be set unconditionally because not all systems understand +# e.g. LANG=C (notably SCO). lt_user_locale= lt_safe_locale= for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES @@ -118,24 +107,15 @@ lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" fi" done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL $lt_unset CDPATH -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" : ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +: ${ECHO="echo"} : ${EGREP="/bin/grep -E"} : ${FGREP="/bin/grep -F"} : ${GREP="/bin/grep"} @@ -164,27 +144,6 @@ dirname="s,/[^/]*$,," basename="s,^.*/,," -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} # func_dirname may be replaced by extended shell implementation - - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation - - # func_dirname_and_basename file append nondir_replacement # perform func_basename and func_dirname in a single function # call: @@ -199,183 +158,33 @@ # those functions but instead duplicate the functionality here. func_dirname_and_basename () { - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} # func_dirname_and_basename may be replaced by extended shell implementation - - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation - - -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' - -# func_normal_abspath PATH -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -# value returned in "$func_normal_abspath_result" -func_normal_abspath () -{ - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi + func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` } -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done +# Generated shell functions inserted here. - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi - - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath="$0" # The name of this program: +# In the unlikely event $progname began with a '-', it would play havoc with +# func_echo (imagine progname=-n), so we prepend ./ in that case: func_dirname_and_basename "$progpath" progname=$func_basename_result +case $progname in + -*) progname=./$progname ;; +esac # Make sure we have an absolute path for reexecution: case $progpath in @@ -406,15 +215,6 @@ # Same as above, but do not quote variable references. double_quote_subst='s/\(["`\\]\)/\\\1/g' -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' - -# Sed substitution that converts a w32 file name or path -# which contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - # Re-`\' parameter expansions in output of double_quote_subst that were # `\'-ed in input to the same. If an odd number of `\' preceded a '$' # in input to double_quote_subst, that '$' was protected from expansion. @@ -443,7 +243,7 @@ # name if it has been set yet. func_echo () { - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" + $ECHO "$progname${mode+: }$mode: $*" } # func_verbose arg... @@ -458,25 +258,18 @@ : } -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} - # func_error arg... # Echo program name prefixed message to standard error. func_error () { - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 + $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 } # func_warning arg... # Echo program name prefixed warning message to standard error. func_warning () { - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 + $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 # bash bug again: : @@ -533,9 +326,9 @@ case $my_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` + my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` + my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` save_mkdir_p_IFS="$IFS"; IFS=':' for my_dir in $my_dir_list; do @@ -585,7 +378,7 @@ func_fatal_error "cannot create temporary directory \`$my_tmpdir'" fi - $ECHO "$my_tmpdir" + $ECHO "X$my_tmpdir" | $Xsed } @@ -599,7 +392,7 @@ { case $1 in *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; + func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; *) func_quote_for_eval_unquoted_result="$1" ;; esac @@ -626,7 +419,7 @@ { case $1 in *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ + my_arg=`$ECHO "X$1" | $Xsed \ -e "$double_quote_subst" -e "$sed_double_backslash"` ;; *) my_arg="$1" ;; @@ -695,39 +488,15 @@ fi } -# func_tr_sh -# Turn $1 into a string suitable for a shell variable name. -# Result is stored in $func_tr_sh_result. All characters -# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -# if $1 begins with a digit, a '_' is prepended as well. -func_tr_sh () -{ - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac -} + + # func_version # Echo version message to standard output and exit. func_version () { - $opt_debug - - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { + $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { s/^# // s/^# *$// s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ @@ -740,28 +509,22 @@ # Echo short help message to standard output and exit. func_usage () { - $opt_debug - - $SED -n '/^# Usage:/,/^# *.*--help/ { + $SED -n '/^# Usage:/,/# -h/ { s/^# // s/^# *$// s/\$progname/'$progname'/ p }' < "$progpath" - echo + $ECHO $ECHO "run \`$progname --help | more' for full usage" exit $? } -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. +# func_help +# Echo long help message to standard output and exit. func_help () { - $opt_debug - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print s/^# // s/^# *$// s*\$progname*'$progname'* @@ -774,15 +537,8 @@ s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi + }' < "$progpath" + exit $? } # func_missing_arg argname @@ -790,106 +546,63 @@ # exit_cmd. func_missing_arg () { - $opt_debug - - func_error "missing argument for $1." + func_error "missing argument for $1" exit_cmd=exit } +exit_cmd=: -# func_split_short_opt shortopt -# Set func_split_short_opt_name and func_split_short_opt_arg shell -# variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () -{ - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' - - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation - - -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () -{ - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' - - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation -exit_cmd=: +# Check that we have a working $ECHO. +if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift +elif test "X$1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then + # Yippee, $ECHO works! + : +else + # Restart under the correct shell, and then maybe $ECHO will work. + exec $SHELL "$progpath" --no-reexec ${1+"$@"} +fi +if test "X$1" = X--fallback-echo; then + # used as fallback echo + shift + cat </dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation - - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation - - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation - - # func_fatal_configuration arg... # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. @@ -923,16 +636,16 @@ # Display the features supported by this script. func_features () { - echo "host: $host" + $ECHO "host: $host" if test "$build_libtool_libs" = yes; then - echo "enable shared libraries" + $ECHO "enable shared libraries" else - echo "disable shared libraries" + $ECHO "disable shared libraries" fi if test "$build_old_libs" = yes; then - echo "enable static libraries" + $ECHO "enable static libraries" else - echo "disable static libraries" + $ECHO "disable static libraries" fi exit $? @@ -979,204 +692,117 @@ esac } -# func_check_version_match -# Ensure that we are using m4 macros, and libtool script from the same -# release of libtool. -func_check_version_match () +# Parse options once, thoroughly. This comes as soon as possible in +# the script to make things like `libtool --version' happen quickly. { - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from an older release. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - fi - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -$progname: but the definition of this LT_INIT comes from revision $macro_revision. -$progname: You should recreate aclocal.m4 with macros from revision $package_revision -$progname: of $PACKAGE $VERSION and run autoconf again. -_LT_EOF - fi - - exit $EXIT_MISMATCH - fi -} - - -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac - - - -# Option defaults: -opt_debug=: -opt_dry_run=false -opt_config=false -opt_preserve_dup_deps=false -opt_features=false -opt_finish=false -opt_help=false -opt_help_all=false -opt_silent=: -opt_verbose=: -opt_silent=false -opt_verbose=false + # Shorthand for --mode=foo, only valid as the first argument + case $1 in + clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; + compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; + execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; + finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; + install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; + link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; + uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; + esac -# Parse options once, thoroughly. This comes as soon as possible in the -# script to make things like `--version' happen as quickly as we can. -{ - # this just eases exit handling - while test $# -gt 0; do + # Parse non-mode specific arguments: + while test "$#" -gt 0; do opt="$1" shift + case $opt in - --debug|-x) opt_debug='set -x' + --config) func_config ;; + + --debug) preserve_args="$preserve_args $opt" func_echo "enabling shell trace mode" + opt_debug='set -x' $opt_debug ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" + + -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break + execute_dlfiles="$execute_dlfiles $1" shift ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac + + --dry-run | -n) opt_dry_run=: ;; + --features) func_features ;; + --finish) mode="finish" ;; + + --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break + case $1 in + # Valid mode arguments: + clean) ;; + compile) ;; + execute) ;; + finish) ;; + install) ;; + link) ;; + relink) ;; + uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $opt" + exit_cmd=exit + break + ;; + esac + + mode="$1" shift ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) + + --preserve-dup-deps) + opt_duplicate_deps=: ;; + + --quiet|--silent) preserve_args="$preserve_args $opt" opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false + + --verbose| -v) preserve_args="$preserve_args $opt" + opt_silent=false ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" + + --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break + preserve_args="$preserve_args $opt $1" + func_enable_tag "$1" # tagname is set here shift ;; - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} + -dlopen=*|--mode=*|--tag=*) + func_opt_split "$opt" + set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} shift ;; - # Separate non-argument short options: - -\?*|-h*|-n*|-v*) - func_split_short_opt "$opt" - set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; + -\?|-h) func_usage ;; + --help) opt_help=: ;; + --version) func_version ;; - --) break ;; - -*) func_fatal_help "unrecognized option \`$opt'" ;; - *) set dummy "$opt" ${1+"$@"}; shift; break ;; + -*) func_fatal_help "unrecognized option \`$opt'" ;; + + *) nonopt="$opt" + break + ;; esac done - # Validate options: - - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi - - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" case $host in *cygwin* | *mingw* | *pw32* | *cegcc*) @@ -1184,44 +810,82 @@ opt_duplicate_compiler_generated_deps=: ;; *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + opt_duplicate_compiler_generated_deps=$opt_duplicate_deps ;; esac - $opt_help || { - # Sanity checks first: - func_check_version_match + # Having warned about all mis-specified options, bail out if + # anything was wrong. + $exit_cmd $EXIT_FAILURE +} - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" +# func_check_version_match +# Ensure that we are using m4 macros, and libtool script from the same +# release of libtool. +func_check_version_match () +{ + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from an older release. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + fi + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +$progname: but the definition of this LT_INIT comes from revision $macro_revision. +$progname: You should recreate aclocal.m4 with macros from revision $package_revision +$progname: of $PACKAGE $VERSION and run autoconf again. +_LT_EOF fi - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" + exit $EXIT_MISMATCH + fi +} - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test "$opt_mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE - fi - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } +## ----------- ## +## Main. ## +## ----------- ## +$opt_help || { + # Sanity checks first: + func_check_version_match - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE -} + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then + func_fatal_configuration "not configured to build any kind of library" + fi + test -z "$mode" && func_fatal_error "error: you must specify a MODE." + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$execute_dlfiles" && test "$mode" != execute; then + func_error "unrecognized option \`-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. + generic_help="$help" + help="Try \`$progname --help --mode=$mode' for more information." +} -## ----------- ## -## Main. ## -## ----------- ## # func_lalib_p file # True iff FILE is a libtool `.la' library or `.lo' object file. @@ -1286,9 +950,12 @@ # temporary ltwrapper_script. func_ltwrapper_scriptname () { - func_dirname_and_basename "$1" "" "." - func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + func_ltwrapper_scriptname_result="" + if func_ltwrapper_executable_p "$1"; then + func_dirname_and_basename "$1" "" "." + func_stripname '' '.exe' "$func_basename_result" + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + fi } # func_ltwrapper_p file @@ -1334,37 +1001,6 @@ } -# func_resolve_sysroot PATH -# Replace a leading = in PATH with a sysroot. Store the result into -# func_resolve_sysroot_result -func_resolve_sysroot () -{ - func_resolve_sysroot_result=$1 - case $func_resolve_sysroot_result in - =*) - func_stripname '=' '' "$func_resolve_sysroot_result" - func_resolve_sysroot_result=$lt_sysroot$func_stripname_result - ;; - esac -} - -# func_replace_sysroot PATH -# If PATH begins with the sysroot, replace it with = and -# store the result into func_replace_sysroot_result. -func_replace_sysroot () -{ - case "$lt_sysroot:$1" in - ?*:"$lt_sysroot"*) - func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" - ;; - *) - # Including no sysroot. - func_replace_sysroot_result=$1 - ;; - esac -} - # func_infer_tag arg # Infer tagged configuration to use if any are available and # if one wasn't chosen via the "--tag" command line option. @@ -1377,15 +1013,13 @@ if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do - func_append_quoted CC_quoted "$arg" + func_quote_for_eval "$arg" + CC_quoted="$CC_quoted $func_quote_for_eval_result" done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` case $@ in # Blanks in the command may have been stripped by the calling shell, # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; + " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; # Blanks at the start of $base_compile will cause this to fail # if we don't check for them as well. *) @@ -1396,13 +1030,11 @@ CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. - func_append_quoted CC_quoted "$arg" + func_quote_for_eval "$arg" + CC_quoted="$CC_quoted $func_quote_for_eval_result" done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` case "$@ " in - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) + " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) # The compiler in the base compile command matches # the one in the tagged configuration. # Assume this is the tagged configuration we want. @@ -1465,486 +1097,6 @@ } } - -################################################## -# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # -################################################## - -# func_convert_core_file_wine_to_w32 ARG -# Helper function used by file name conversion functions when $build is *nix, -# and $host is mingw, cygwin, or some other w32 environment. Relies on a -# correctly configured wine environment available, with the winepath program -# in $build's $PATH. -# -# ARG is the $build file name to be converted to w32 format. -# Result is available in $func_convert_core_file_wine_to_w32_result, and will -# be empty on error (or when ARG is empty) -func_convert_core_file_wine_to_w32 () -{ - $opt_debug - func_convert_core_file_wine_to_w32_result="$1" - if test -n "$1"; then - # Unfortunately, winepath does not exit with a non-zero error code, so we - # are forced to check the contents of stdout. On the other hand, if the - # command is not found, the shell will set an exit code of 127 and print - # *an error message* to stdout. So we must check for both error code of - # zero AND non-empty stdout, which explains the odd construction: - func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then - func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` - else - func_convert_core_file_wine_to_w32_result= - fi - fi -} -# end: func_convert_core_file_wine_to_w32 - - -# func_convert_core_path_wine_to_w32 ARG -# Helper function used by path conversion functions when $build is *nix, and -# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly -# configured wine environment available, with the winepath program in $build's -# $PATH. Assumes ARG has no leading or trailing path separator characters. -# -# ARG is path to be converted from $build format to win32. -# Result is available in $func_convert_core_path_wine_to_w32_result. -# Unconvertible file (directory) names in ARG are skipped; if no directory names -# are convertible, then the result may be empty. -func_convert_core_path_wine_to_w32 () -{ - $opt_debug - # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" - if test -n "$1"; then - oldIFS=$IFS - IFS=: - for func_convert_core_path_wine_to_w32_f in $1; do - IFS=$oldIFS - func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then - if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" - else - func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" - fi - fi - done - IFS=$oldIFS - fi -} -# end: func_convert_core_path_wine_to_w32 - - -# func_cygpath ARGS... -# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when -# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) -# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or -# (2), returns the Cygwin file name or path in func_cygpath_result (input -# file name or path is assumed to be in w32 format, as previously converted -# from $build's *nix or MSYS format). In case (3), returns the w32 file name -# or path in func_cygpath_result (input file name or path is assumed to be in -# Cygwin format). Returns an empty string on error. -# -# ARGS are passed to cygpath, with the last one being the file name or path to -# be converted. -# -# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH -# environment variable; do not put it in $PATH. -func_cygpath () -{ - $opt_debug - if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then - func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` - if test "$?" -ne 0; then - # on failure, ensure result is empty - func_cygpath_result= - fi - else - func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" - fi -} -#end: func_cygpath - - -# func_convert_core_msys_to_w32 ARG -# Convert file name or path ARG from MSYS format to w32 format. Return -# result in func_convert_core_msys_to_w32_result. -func_convert_core_msys_to_w32 () -{ - $opt_debug - # awkward: cmd appends spaces to result - func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -} -#end: func_convert_core_msys_to_w32 - - -# func_convert_file_check ARG1 ARG2 -# Verify that ARG1 (a file name in $build format) was converted to $host -# format in ARG2. Otherwise, emit an error message, but continue (resetting -# func_to_host_file_result to ARG1). -func_convert_file_check () -{ - $opt_debug - if test -z "$2" && test -n "$1" ; then - func_error "Could not determine host file name corresponding to" - func_error " \`$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback: - func_to_host_file_result="$1" - fi -} -# end func_convert_file_check - - -# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH -# Verify that FROM_PATH (a path in $build format) was converted to $host -# format in TO_PATH. Otherwise, emit an error message, but continue, resetting -# func_to_host_file_result to a simplistic fallback value (see below). -func_convert_path_check () -{ - $opt_debug - if test -z "$4" && test -n "$3"; then - func_error "Could not determine the host path corresponding to" - func_error " \`$3'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback. This is a deliberately simplistic "conversion" and - # should not be "improved". See libtool.info. - if test "x$1" != "x$2"; then - lt_replace_pathsep_chars="s|$1|$2|g" - func_to_host_path_result=`echo "$3" | - $SED -e "$lt_replace_pathsep_chars"` - else - func_to_host_path_result="$3" - fi - fi -} -# end func_convert_path_check - - -# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG -# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT -# and appending REPL if ORIG matches BACKPAT. -func_convert_path_front_back_pathsep () -{ - $opt_debug - case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" - ;; - esac - case $4 in - $2 ) func_append func_to_host_path_result "$3" - ;; - esac -} -# end func_convert_path_front_back_pathsep - - -################################################## -# $build to $host FILE NAME CONVERSION FUNCTIONS # -################################################## -# invoked via `$to_host_file_cmd ARG' -# -# In each case, ARG is the path to be converted from $build to $host format. -# Result will be available in $func_to_host_file_result. - - -# func_to_host_file ARG -# Converts the file name ARG from $build format to $host format. Return result -# in func_to_host_file_result. -func_to_host_file () -{ - $opt_debug - $to_host_file_cmd "$1" -} -# end func_to_host_file - - -# func_to_tool_file ARG LAZY -# converts the file name ARG from $build format to toolchain format. Return -# result in func_to_tool_file_result. If the conversion in use is listed -# in (the comma separated) LAZY, no conversion takes place. -func_to_tool_file () -{ - $opt_debug - case ,$2, in - *,"$to_tool_file_cmd",*) - func_to_tool_file_result=$1 - ;; - *) - $to_tool_file_cmd "$1" - func_to_tool_file_result=$func_to_host_file_result - ;; - esac -} -# end func_to_tool_file - - -# func_convert_file_noop ARG -# Copy ARG to func_to_host_file_result. -func_convert_file_noop () -{ - func_to_host_file_result="$1" -} -# end func_convert_file_noop - - -# func_convert_file_msys_to_w32 ARG -# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic -# conversion to w32 is not available inside the cwrapper. Returns result in -# func_to_host_file_result. -func_convert_file_msys_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_msys_to_w32 - - -# func_convert_file_cygwin_to_w32 ARG -# Convert file name ARG from Cygwin to w32 format. Returns result in -# func_to_host_file_result. -func_convert_file_cygwin_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - # because $build is cygwin, we call "the" cygpath in $PATH; no need to use - # LT_CYGPATH in this case. - func_to_host_file_result=`cygpath -m "$1"` - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_cygwin_to_w32 - - -# func_convert_file_nix_to_w32 ARG -# Convert file name ARG from *nix to w32 format. Requires a wine environment -# and a working winepath. Returns result in func_to_host_file_result. -func_convert_file_nix_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_nix_to_w32 - - -# func_convert_file_msys_to_cygwin ARG -# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -# Returns result in func_to_host_file_result. -func_convert_file_msys_to_cygwin () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_msys_to_cygwin - - -# func_convert_file_nix_to_cygwin ARG -# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed -# in a wine environment, working winepath, and LT_CYGPATH set. Returns result -# in func_to_host_file_result. -func_convert_file_nix_to_cygwin () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. - func_convert_core_file_wine_to_w32 "$1" - func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_nix_to_cygwin - - -############################################# -# $build to $host PATH CONVERSION FUNCTIONS # -############################################# -# invoked via `$to_host_path_cmd ARG' -# -# In each case, ARG is the path to be converted from $build to $host format. -# The result will be available in $func_to_host_path_result. -# -# Path separators are also converted from $build format to $host format. If -# ARG begins or ends with a path separator character, it is preserved (but -# converted to $host format) on output. -# -# All path conversion functions are named using the following convention: -# file name conversion function : func_convert_file_X_to_Y () -# path conversion function : func_convert_path_X_to_Y () -# where, for any given $build/$host combination the 'X_to_Y' value is the -# same. If conversion functions are added for new $build/$host combinations, -# the two new functions must follow this pattern, or func_init_to_host_path_cmd -# will break. - - -# func_init_to_host_path_cmd -# Ensures that function "pointer" variable $to_host_path_cmd is set to the -# appropriate value, based on the value of $to_host_file_cmd. -to_host_path_cmd= -func_init_to_host_path_cmd () -{ - $opt_debug - if test -z "$to_host_path_cmd"; then - func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" - fi -} - - -# func_to_host_path ARG -# Converts the path ARG from $build format to $host format. Return result -# in func_to_host_path_result. -func_to_host_path () -{ - $opt_debug - func_init_to_host_path_cmd - $to_host_path_cmd "$1" -} -# end func_to_host_path - - -# func_convert_path_noop ARG -# Copy ARG to func_to_host_path_result. -func_convert_path_noop () -{ - func_to_host_path_result="$1" -} -# end func_convert_path_noop - - -# func_convert_path_msys_to_w32 ARG -# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic -# conversion to w32 is not available inside the cwrapper. Returns result in -# func_to_host_path_result. -func_convert_path_msys_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # Remove leading and trailing path separator characters from ARG. MSYS - # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; - # and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_msys_to_w32 - - -# func_convert_path_cygwin_to_w32 ARG -# Convert path ARG from Cygwin to w32 format. Returns result in -# func_to_host_file_result. -func_convert_path_cygwin_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_cygwin_to_w32 - - -# func_convert_path_nix_to_w32 ARG -# Convert path ARG from *nix to w32 format. Requires a wine environment and -# a working winepath. Returns result in func_to_host_file_result. -func_convert_path_nix_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_nix_to_w32 - - -# func_convert_path_msys_to_cygwin ARG -# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -# Returns result in func_to_host_file_result. -func_convert_path_msys_to_cygwin () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" - fi -} -# end func_convert_path_msys_to_cygwin - - -# func_convert_path_nix_to_cygwin ARG -# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a -# a wine environment, working winepath, and LT_CYGPATH set. Returns result in -# func_to_host_file_result. -func_convert_path_nix_to_cygwin () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # Remove leading and trailing path separator characters from - # ARG. msys behavior is inconsistent here, cygpath turns them - # into '.;' and ';.', and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" - fi -} -# end func_convert_path_nix_to_cygwin - - # func_mode_compile arg... func_mode_compile () { @@ -1985,12 +1137,12 @@ ;; -pie | -fpie | -fPIE) - func_append pie_flag " $arg" + pie_flag="$pie_flag $arg" continue ;; -shared | -static | -prefer-pic | -prefer-non-pic) - func_append later " $arg" + later="$later $arg" continue ;; @@ -2011,14 +1163,15 @@ save_ifs="$IFS"; IFS=',' for arg in $args; do IFS="$save_ifs" - func_append_quoted lastarg "$arg" + func_quote_for_eval "$arg" + lastarg="$lastarg $func_quote_for_eval_result" done IFS="$save_ifs" func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result # Add the arguments to base_compile. - func_append base_compile " $lastarg" + base_compile="$base_compile $lastarg" continue ;; @@ -2034,7 +1187,8 @@ esac # case $arg_mode # Aesthetically quote the previous argument. - func_append_quoted base_compile "$lastarg" + func_quote_for_eval "$lastarg" + base_compile="$base_compile $func_quote_for_eval_result" done # for arg case $arg_mode in @@ -2059,7 +1213,7 @@ *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.obj | *.sx) func_xform "$libobj" libobj=$func_xform_result ;; @@ -2134,7 +1288,7 @@ # Calculate the filename of the output object if compiler does # not support -o with -c if test "$compiler_c_o" = no; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} + output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} lockfile="$output_obj.lock" else output_obj= @@ -2165,16 +1319,17 @@ $opt_dry_run || $RM $removelist exit $EXIT_FAILURE fi - func_append removelist " $output_obj" + removelist="$removelist $output_obj" $ECHO "$srcfile" > "$lockfile" fi $opt_dry_run || $RM $removelist - func_append removelist " $lockfile" + removelist="$removelist $lockfile" trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 - srcfile=$func_to_tool_file_result + if test -n "$fix_srcfile_path"; then + eval srcfile=\"$fix_srcfile_path\" + fi func_quote_for_eval "$srcfile" qsrcfile=$func_quote_for_eval_result @@ -2194,7 +1349,7 @@ if test -z "$output_obj"; then # Place PIC objects in $objdir - func_append command " -o $lobj" + command="$command -o $lobj" fi func_show_eval_locale "$command" \ @@ -2241,11 +1396,11 @@ command="$base_compile $qsrcfile $pic_flag" fi if test "$compiler_c_o" = yes; then - func_append command " -o $obj" + command="$command -o $obj" fi # Suppress compiler output if we already did a PIC compilation. - func_append command "$suppress_output" + command="$command$suppress_output" func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' @@ -2290,13 +1445,13 @@ } $opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} +test "$mode" = compile && func_mode_compile ${1+"$@"} } func_mode_help () { # We need to display help for each of the modes. - case $opt_mode in + case $mode in "") # Generic help is extracted from the usage comments # at the start of this file. @@ -2327,11 +1482,10 @@ -o OUTPUT-FILE set the output file name to OUTPUT-FILE -no-suppress do not suppress compiler output for multiple passes - -prefer-pic try to build PIC objects only - -prefer-non-pic try to build non-PIC objects only + -prefer-pic try to building PIC objects only + -prefer-non-pic try to building non-PIC objects only -shared do not build a \`.o' file suitable for static linking -static only build a \`.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler COMPILE-COMMAND is a command to be used in creating a \`standard' object file from the given SOURCEFILE. @@ -2384,7 +1538,7 @@ The following components of INSTALL-COMMAND are treated specially: - -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation + -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation The rest of the components are interpreted as arguments to that command (only BSD-compatible install options are recognized)." @@ -2404,8 +1558,6 @@ -all-static do not do any dynamic linking at all -avoid-version do not add a version suffix if possible - -bindir BINDIR specify path to binaries directory (for systems where - libraries must be found in the PATH setting at runtime) -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) @@ -2434,11 +1586,6 @@ -version-info CURRENT[:REVISION[:AGE]] specify library version info [each variable defaults to 0] -weak LIBNAME declare that the target provides the LIBNAME interface - -Wc,FLAG - -Xcompiler FLAG pass linker-specific FLAG directly to the compiler - -Wl,FLAG - -Xlinker FLAG pass linker-specific FLAG directly to the linker - -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) All other options (arguments beginning with \`-') are ignored. @@ -2472,44 +1619,18 @@ ;; *) - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode \`$mode'" ;; esac - echo + $ECHO $ECHO "Try \`$progname --help' for more information about other modes." + + exit $? } -# Now that we've collected a possible --mode arg, show help if necessary -if $opt_help; then - if test "$opt_help" = :; then - func_mode_help - else - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do - func_mode_help - done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do - echo - func_mode_help - done - } | - sed '1d - /^When reporting/,/^Report/{ - H - d - } - $x - /information about other modes/d - /more detailed .*MODE/d - s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' - fi - exit $? -fi + # Now that we've collected a possible --mode arg, show help if necessary + $opt_help && func_mode_help # func_mode_execute arg... @@ -2522,16 +1643,13 @@ func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. - for file in $opt_dlopen; do + for file in $execute_dlfiles; do test -f "$file" \ || func_fatal_help "\`$file' is not a file" dir= case $file in *.la) - func_resolve_sysroot "$file" - file=$func_resolve_sysroot_result - # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ || func_fatal_help "\`$lib' is not a valid libtool archive" @@ -2553,7 +1671,7 @@ dir="$func_dirname_result" if test -f "$dir/$objdir/$dlname"; then - func_append dir "/$objdir" + dir="$dir/$objdir" else if test ! -f "$dir/$dlname"; then func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" @@ -2594,7 +1712,7 @@ for file do case $file in - -* | *.la | *.lo ) ;; + -*) ;; *) # Do a test to see if this is really a libtool program. if func_ltwrapper_script_p "$file"; then @@ -2610,7 +1728,8 @@ ;; esac # Quote arguments (to preserve shell metacharacters). - func_append_quoted args "$file" + func_quote_for_eval "$file" + args="$args $func_quote_for_eval_result" done if test "X$opt_dry_run" = Xfalse; then @@ -2635,66 +1754,29 @@ # Display what would be done. if test -n "$shlibpath_var"; then eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" + $ECHO "export $shlibpath_var" fi $ECHO "$cmd$args" exit $EXIT_SUCCESS fi } -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} +test "$mode" = execute && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { $opt_debug - libs= - libdirs= + libdirs="$nonopt" admincmds= - for opt in "$nonopt" ${1+"$@"} - do - if test -d "$opt"; then - func_append libdirs " $opt" - - elif test -f "$opt"; then - if func_lalib_unsafe_p "$opt"; then - func_append libs " $opt" - else - func_warning "\`$opt' is not a valid libtool archive" - fi - - else - func_fatal_error "invalid argument \`$opt'" - fi - done - - if test -n "$libs"; then - if test -n "$lt_sysroot"; then - sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` - sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" - else - sysroot_cmd= - fi - - # Remove sysroot references - if $opt_dry_run; then - for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" - done - else - tmpdir=`func_mktempdir` - for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ - > $tmpdir/tmp-la - mv -f $tmpdir/tmp-la $lib - done - ${RM}r "$tmpdir" - fi - fi - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + for dir + do + libdirs="$libdirs $dir" + done + for libdir in $libdirs; do if test -n "$finish_cmds"; then # Do each command in the finish commands. @@ -2704,7 +1786,7 @@ if test -n "$finish_eval"; then # Do the single finish_eval. eval cmds=\"$finish_eval\" - $opt_dry_run || eval "$cmds" || func_append admincmds " + $opt_dry_run || eval "$cmds" || admincmds="$admincmds $cmds" fi done @@ -2713,55 +1795,53 @@ # Exit here if they wanted silent mode. $opt_silent && exit $EXIT_SUCCESS - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - echo "----------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - $ECHO " $libdir" - done - echo - echo "If you ever happen to want to link against installed libraries" - echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " during execution" - fi - if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" - echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - - $ECHO " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $ECHO " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - echo + $ECHO "X----------------------------------------------------------------------" | $Xsed + $ECHO "Libraries have been installed in:" + for libdir in $libdirs; do + $ECHO " $libdir" + done + $ECHO + $ECHO "If you ever happen to want to link against installed libraries" + $ECHO "in a given directory, LIBDIR, you must either use libtool, and" + $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'" + $ECHO "flag during linking and do at least one of the following:" + if test -n "$shlibpath_var"; then + $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable" + $ECHO " during execution" + fi + if test -n "$runpath_var"; then + $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" + $ECHO " during linking" + fi + if test -n "$hardcode_libdir_flag_spec"; then + libdir=LIBDIR + eval flag=\"$hardcode_libdir_flag_spec\" - echo "See any operating system documentation about shared libraries for" - case $host in - solaris2.[6789]|solaris2.1[0-9]) - echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" - echo "pages." - ;; - *) - echo "more information, such as the ld(1) and ld.so(8) manual pages." - ;; - esac - echo "----------------------------------------------------------------------" + $ECHO " - use the \`$flag' linker flag" fi + if test -n "$admincmds"; then + $ECHO " - have your system administrator run these commands:$admincmds" + fi + if test -f /etc/ld.so.conf; then + $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + fi + $ECHO + + $ECHO "See any operating system documentation about shared libraries for" + case $host in + solaris2.[6789]|solaris2.1[0-9]) + $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" + $ECHO "pages." + ;; + *) + $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." + ;; + esac + $ECHO "X----------------------------------------------------------------------" | $Xsed exit $EXIT_SUCCESS } -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} +test "$mode" = finish && func_mode_finish ${1+"$@"} # func_mode_install arg... @@ -2772,7 +1852,7 @@ # install_prog (especially on Windows NT). if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then + $ECHO "X$nonopt" | $GREP shtool >/dev/null; then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -2786,12 +1866,7 @@ # The real first argument should be the name of the installation program. # Aesthetically quote it. func_quote_for_eval "$arg" - func_append install_prog "$func_quote_for_eval_result" - install_shared_prog=$install_prog - case " $install_prog " in - *[\\\ /]cp\ *) install_cp=: ;; - *) install_cp=false ;; - esac + install_prog="$install_prog$func_quote_for_eval_result" # We need to accept at least all the BSD install flags. dest= @@ -2801,12 +1876,10 @@ install_type= isdir=no stripme= - no_mode=: for arg do - arg2= if test -n "$dest"; then - func_append files " $dest" + files="$files $dest" dest=$arg continue fi @@ -2814,9 +1887,10 @@ case $arg in -d) isdir=yes ;; -f) - if $install_cp; then :; else - prev=$arg - fi + case " $install_prog " in + *[\\\ /]cp\ *) ;; + *) prev=$arg ;; + esac ;; -g | -m | -o) prev=$arg @@ -2830,10 +1904,6 @@ *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then - arg2=$install_override_mode - no_mode=false - fi prev= else dest=$arg @@ -2844,11 +1914,7 @@ # Aesthetically quote the argument. func_quote_for_eval "$arg" - func_append install_prog " $func_quote_for_eval_result" - if test -n "$arg2"; then - func_quote_for_eval "$arg2" - fi - func_append install_shared_prog " $func_quote_for_eval_result" + install_prog="$install_prog $func_quote_for_eval_result" done test -z "$install_prog" && \ @@ -2857,13 +1923,6 @@ test -n "$prev" && \ func_fatal_help "the \`$prev' option requires an argument" - if test -n "$install_override_mode" && $no_mode; then - if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" - func_append install_shared_prog " -m $func_quote_for_eval_result" - fi - fi - if test -z "$files"; then if test -z "$dest"; then func_fatal_help "no file or destination specified" @@ -2918,13 +1977,10 @@ case $file in *.$libext) # Do the static libraries later. - func_append staticlibs " $file" + staticlibs="$staticlibs $file" ;; *.la) - func_resolve_sysroot "$file" - file=$func_resolve_sysroot_result - # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ || func_fatal_help "\`$file' is not a valid libtool archive" @@ -2938,23 +1994,23 @@ if test "X$destdir" = "X$libdir"; then case "$current_libdirs " in *" $libdir "*) ;; - *) func_append current_libdirs " $libdir" ;; + *) current_libdirs="$current_libdirs $libdir" ;; esac else # Note the libdir as a future libdir. case "$future_libdirs " in *" $libdir "*) ;; - *) func_append future_libdirs " $libdir" ;; + *) future_libdirs="$future_libdirs $libdir" ;; esac fi func_dirname "$file" "/" "" dir="$func_dirname_result" - func_append dir "$objdir" + dir="$dir$objdir" if test -n "$relink_command"; then # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` + inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` # Don't allow the user to place us outside of our expected # location b/c this prevents finding dependent libraries that @@ -2967,9 +2023,9 @@ if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` else - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` + relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` fi func_warning "relinking \`$file'" @@ -2987,7 +2043,7 @@ test -n "$relink_command" && srcname="$realname"T # Install the shared library and build the symlinks. - func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ + func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ 'exit $?' tstripme="$stripme" case $host_os in @@ -3027,7 +2083,7 @@ func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. - test -n "$old_library" && func_append staticlibs " $dir/$old_library" + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" ;; *.lo) @@ -3127,7 +2183,7 @@ if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test if test -n "$libdir" && test ! -f "$libfile"; then func_warning "\`$lib' has not been installed in \`$libdir'" finalize=no @@ -3146,7 +2202,7 @@ file="$func_basename_result" outputname="$tmpdir/$file" # Replace the output file specification. - relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` + relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` $opt_silent || { func_quote_for_expand "$relink_command" @@ -3165,7 +2221,7 @@ } else # Install the binary that we compiled earlier. - file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` + file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` fi fi @@ -3224,7 +2280,7 @@ fi } -test "$opt_mode" = install && func_mode_install ${1+"$@"} +test "$mode" = install && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -3267,22 +2323,6 @@ extern \"C\" { #endif -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) -#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" -#endif - -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT_DLSYM_CONST -#else -# define LT_DLSYM_CONST const -#endif - /* External symbol declarations for the compiler. */\ " @@ -3292,11 +2332,10 @@ $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" # Add our own program objects to the symbol list. - progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` + progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` for progfile in $progfiles; do - func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" - $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" + func_verbose "extracting global C symbols from \`$progfile'" + $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" done if test -n "$exclude_expsyms"; then @@ -3332,7 +2371,7 @@ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in - *cygwin* | *mingw* | *cegcc* ) + *cygwin | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ;; @@ -3345,52 +2384,10 @@ func_verbose "extracting global C symbols from \`$dlprefile'" func_basename "$dlprefile" name="$func_basename_result" - case $host in - *cygwin* | *mingw* | *cegcc* ) - # if an import library, we need to obtain dlname - if func_win32_import_lib_p "$dlprefile"; then - func_tr_sh "$dlprefile" - eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename="" - if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then - # Use subshell, to avoid clobbering current variable values - dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then - func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" - else - # no lafile. user explicitly requested -dlpreopen . - $sharedlib_from_linklib_cmd "$dlprefile" - dlprefile_dlbasename=$sharedlib_from_linklib_result - fi - fi - $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then - eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' - else - func_warning "Could not compute DLL name from $name" - eval '$ECHO ": $name " >> "$nlist"' - fi - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | - $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" - } - else # not an import lib - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - fi - ;; - *) - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - ;; - esac + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } done $opt_dry_run || { @@ -3418,19 +2415,36 @@ if test -f "$nlist"S; then eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' else - echo '/* NONE */' >> "$output_objdir/$my_dlsyms" + $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" fi - echo >> "$output_objdir/$my_dlsyms" "\ + $ECHO >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ typedef struct { const char *name; void *address; } lt_dlsymlist; -extern LT_DLSYM_CONST lt_dlsymlist +" + case $host in + *cygwin* | *mingw* | *cegcc* ) + $ECHO >> "$output_objdir/$my_dlsyms" "\ +/* DATA imports from DLLs on WIN32 con't be const, because + runtime relocations are performed -- see ld's documentation + on pseudo-relocs. */" + lt_dlsym_const= ;; + *osf5*) + echo >> "$output_objdir/$my_dlsyms" "\ +/* This system does not cope well with relocations in const data */" + lt_dlsym_const= ;; + *) + lt_dlsym_const=const ;; + esac + + $ECHO >> "$output_objdir/$my_dlsyms" "\ +extern $lt_dlsym_const lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[]; -LT_DLSYM_CONST lt_dlsymlist +$lt_dlsym_const lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = {\ { \"$my_originator\", (void *) 0 }," @@ -3443,7 +2457,7 @@ eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" ;; esac - echo >> "$output_objdir/$my_dlsyms" "\ + $ECHO >> "$output_objdir/$my_dlsyms" "\ {0, (void *) 0} }; @@ -3486,7 +2500,7 @@ for arg in $LTCFLAGS; do case $arg in -pie | -fpie | -fPIE) ;; - *) func_append symtab_cflags " $arg" ;; + *) symtab_cflags="$symtab_cflags $arg" ;; esac done @@ -3501,16 +2515,16 @@ case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` else - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` fi ;; *) - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` ;; esac ;; @@ -3524,8 +2538,8 @@ # really was required. # Nullify the symbol file. - compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` fi } @@ -3535,7 +2549,6 @@ # Need a lot of goo to handle *both* DLLs and import libs # Has to be a shell function in order to 'eat' the argument # that is supplied when $file_magic_command is called. -# Despite the name, also deal with 64 bit binaries. func_win32_libid () { $opt_debug @@ -3546,11 +2559,9 @@ win32_libid_type="x86 archive import" ;; *ar\ archive*) # could be an import, or static - # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | - $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then + win32_nmres=`eval $NM -f posix -A $1 | $SED -n -e ' 1,100{ / I /{ @@ -3579,131 +2590,6 @@ $ECHO "$win32_libid_type" } -# func_cygming_dll_for_implib ARG -# -# Platform-specific function to extract the -# name of the DLL associated with the specified -# import library ARG. -# Invoked by eval'ing the libtool variable -# $sharedlib_from_linklib_cmd -# Result is available in the variable -# $sharedlib_from_linklib_result -func_cygming_dll_for_implib () -{ - $opt_debug - sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` -} - -# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs -# -# The is the core of a fallback implementation of a -# platform-specific function to extract the name of the -# DLL associated with the specified import library LIBNAME. -# -# SECTION_NAME is either .idata$6 or .idata$7, depending -# on the platform and compiler that created the implib. -# -# Echos the name of the DLL associated with the -# specified import library. -func_cygming_dll_for_implib_fallback_core () -{ - $opt_debug - match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` - $OBJDUMP -s --section "$1" "$2" 2>/dev/null | - $SED '/^Contents of section '"$match_literal"':/{ - # Place marker at beginning of archive member dllname section - s/.*/====MARK====/ - p - d - } - # These lines can sometimes be longer than 43 characters, but - # are always uninteresting - /:[ ]*file format pe[i]\{,1\}-/d - /^In archive [^:]*:/d - # Ensure marker is printed - /^====MARK====/p - # Remove all lines with less than 43 characters - /^.\{43\}/!d - # From remaining lines, remove first 43 characters - s/^.\{43\}//' | - $SED -n ' - # Join marker and all lines until next marker into a single line - /^====MARK====/ b para - H - $ b para - b - :para - x - s/\n//g - # Remove the marker - s/^====MARK====// - # Remove trailing dots and whitespace - s/[\. \t]*$// - # Print - /./p' | - # we now have a list, one entry per line, of the stringified - # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is - # a '.' (that is, objdump's representation of an unprintable - # character.) This should work for all archives with less than - # 0x302f exports -- but will fail for DLLs whose name actually - # begins with a literal '.' or a single character followed by - # a '.'. - # - # Of those that remain, print the first one. - $SED -e '/^\./d;/^.\./d;q' -} - -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - -# func_cygming_dll_for_implib_fallback ARG -# Platform-specific function to extract the -# name of the DLL associated with the specified -# import library ARG. -# -# This fallback implementation is for use when $DLLTOOL -# does not support the --identify-strict option. -# Invoked by eval'ing the libtool variable -# $sharedlib_from_linklib_cmd -# Result is available in the variable -# $sharedlib_from_linklib_result -func_cygming_dll_for_implib_fallback () -{ - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then - # binutils import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then - # ms-generated import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` - else - # unknown - sharedlib_from_linklib_result="" - fi -} # func_extract_an_archive dir oldlib @@ -3712,18 +2598,7 @@ $opt_debug f_ex_an_ar_dir="$1"; shift f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then - lockfile=$f_ex_an_ar_oldlib.lock - until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do - func_echo "Waiting for $lockfile to be removed" - sleep 2 - done - fi - func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ - 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then - $opt_dry_run || rm -f "$lockfile" - fi + func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then : else @@ -3794,7 +2669,7 @@ darwin_file= darwin_files= for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` + darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` $LIPO -create -output "$darwin_file" $darwin_files done # $darwin_filelist $RM -rf unfat-$$ @@ -3809,30 +2684,25 @@ func_extract_an_archive "$my_xdir" "$my_xabs" ;; esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` done func_extract_archives_result="$my_oldobjs" } -# func_emit_wrapper [arg=no] -# -# Emit a libtool wrapper script on stdout. -# Don't directly open a file because we may want to -# incorporate the script contents within a cygwin/mingw -# wrapper executable. Must ONLY be called from within -# func_mode_link because it depends on a number of variables -# set therein. + +# func_emit_wrapper_part1 [arg=no] # -# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -# variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is -# the $objdir directory. This is a cygwin/mingw-specific -# behavior. -func_emit_wrapper () -{ - func_emit_wrapper_arg1=${1-no} +# Emit the first part of a libtool wrapper script on stdout. +# For more information, see the description associated with +# func_emit_wrapper(), below. +func_emit_wrapper_part1 () +{ + func_emit_wrapper_part1_arg1=no + if test -n "$1" ; then + func_emit_wrapper_part1_arg1=$1 + fi $ECHO "\ #! $SHELL @@ -3848,6 +2718,7 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. +Xsed='${SED} -e 1s/^X//' sed_quote_subst='$sed_quote_subst' # Be Bourne compatible @@ -3878,132 +2749,31 @@ else # When we are sourced in execute mode, \$file and \$ECHO are already set. if test \"\$libtool_execute_magic\" != \"$magic\"; then - file=\"\$0\"" - - qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` - $ECHO "\ - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$1 -_LTECHO_EOF' -} - ECHO=\"$qECHO\" - fi - -# Very basic option parsing. These options are (a) specific to -# the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on -# windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match -# this pattern). -# -# There are only two supported options: --lt-debug and -# --lt-dump-script. There is, deliberately, no --lt-help. -# -# The first argument to this parsing function should be the -# script's $0 value, followed by "$@". -lt_option_debug= -func_parse_lt_options () -{ - lt_script_arg0=\$0 - shift - for lt_opt - do - case \"\$lt_opt\" in - --lt-debug) lt_option_debug=1 ;; - --lt-dump-script) - lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` - test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. - lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` - cat \"\$lt_dump_D/\$lt_dump_F\" - exit 0 - ;; - --lt-*) - \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 - exit 1 - ;; - esac - done - - # Print the debug banner immediately: - if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 - fi -} - -# Used when --lt-debug. Prints its arguments to stdout -# (redirection is the responsibility of the caller) -func_lt_dump_args () -{ - lt_dump_args_N=1; - for lt_arg - do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" - lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` - done -} - -# Core function for launching the target application -func_exec_program_core () -{ -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2* | *-cegcc*) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir/\$program\" \${1+\"\$@\"} + ECHO=\"$qecho\" + file=\"\$0\" + # Make sure echo works. + if test \"X\$1\" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift + elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then + # Yippee, \$ECHO works! + : + else + # Restart under the correct shell, and then maybe \$ECHO will work. + exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} + fi + fi\ " - ;; - esac - $ECHO "\ - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 - exit 1 -} - -# A function to encapsulate launching the target application -# Strips options in the --lt-* namespace from \$@ and -# launches target application with the remaining arguments. -func_exec_program () -{ - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done - func_exec_program_core \${1+\"\$@\"} -} - - # Parse options - func_parse_lt_options \"\$0\" \${1+\"\$@\"} + $ECHO "\ # Find the directory that this script lives in. - thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` + thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` test \"x\$thisdir\" = \"x\$file\" && thisdir=. # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` + file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` while test -n \"\$file\"; do - destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` + destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` # If there was a directory component, then change thisdir. if test \"x\$destdir\" != \"x\$file\"; then @@ -4013,13 +2783,30 @@ esac fi - file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` + file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` + file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` done +" +} +# end: func_emit_wrapper_part1 + +# func_emit_wrapper_part2 [arg=no] +# +# Emit the second part of a libtool wrapper script on stdout. +# For more information, see the description associated with +# func_emit_wrapper(), below. +func_emit_wrapper_part2 () +{ + func_emit_wrapper_part2_arg1=no + if test -n "$1" ; then + func_emit_wrapper_part2_arg1=$1 + fi + + $ECHO "\ # Usually 'no', except on cygwin/mingw when embedded into # the cwrapper. - WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then # special case for '.' if test \"\$thisdir\" = \".\"; then @@ -4027,7 +2814,7 @@ fi # remove .libs from thisdir case \"\$thisdir\" in - *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; + *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; $objdir ) thisdir=. ;; esac fi @@ -4082,18 +2869,6 @@ if test -f \"\$progdir/\$program\"; then" - # fixup the dll searchpath if we need to. - # - # Fix the DLL searchpath if we need to. Do this before prepending - # to shlibpath, because on Windows, both are PATH and uninstalled - # libraries must come first. - if test -n "$dllsearchpath"; then - $ECHO "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - # Export our shlibpath_var if we have one. if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ @@ -4102,28 +2877,253 @@ # Some systems cannot cope with colon-terminated $shlibpath_var # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` + $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` export $shlibpath_var " fi + # fixup the dll searchpath if we need to. + if test -n "$dllsearchpath"; then + $ECHO "\ + # Add the dll search path components to the executable PATH + PATH=$dllsearchpath:\$PATH +" + fi + $ECHO "\ if test \"\$libtool_execute_magic\" != \"$magic\"; then # Run the actual program with our arguments. - func_exec_program \${1+\"\$@\"} +" + case $host in + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2* | *-cegcc*) + $ECHO "\ + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +" + ;; + + *) + $ECHO "\ + exec \"\$progdir/\$program\" \${1+\"\$@\"} +" + ;; + esac + $ECHO "\ + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 + exit 1 fi else # The program doesn't exist. \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 - \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 + $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 fi fi\ " } +# end: func_emit_wrapper_part2 + + +# func_emit_wrapper [arg=no] +# +# Emit a libtool wrapper script on stdout. +# Don't directly open a file because we may want to +# incorporate the script contents within a cygwin/mingw +# wrapper executable. Must ONLY be called from within +# func_mode_link because it depends on a number of variables +# set therein. +# +# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR +# variable will take. If 'yes', then the emitted script +# will assume that the directory in which it is stored is +# the $objdir directory. This is a cygwin/mingw-specific +# behavior. +func_emit_wrapper () +{ + func_emit_wrapper_arg1=no + if test -n "$1" ; then + func_emit_wrapper_arg1=$1 + fi + + # split this up so that func_emit_cwrapperexe_src + # can call each part independently. + func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" + func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" +} + + +# func_to_host_path arg +# +# Convert paths to host format when used with build tools. +# Intended for use with "native" mingw (where libtool itself +# is running under the msys shell), or in the following cross- +# build environments: +# $build $host +# mingw (msys) mingw [e.g. native] +# cygwin mingw +# *nix + wine mingw +# where wine is equipped with the `winepath' executable. +# In the native mingw case, the (msys) shell automatically +# converts paths for any non-msys applications it launches, +# but that facility isn't available from inside the cwrapper. +# Similar accommodations are necessary for $host mingw and +# $build cygwin. Calling this function does no harm for other +# $host/$build combinations not listed above. +# +# ARG is the path (on $build) that should be converted to +# the proper representation for $host. The result is stored +# in $func_to_host_path_result. +func_to_host_path () +{ + func_to_host_path_result="$1" + if test -n "$1" ; then + case $host in + *mingw* ) + lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + case $build in + *mingw* ) # actually, msys + # awkward: cmd appends spaces to result + lt_sed_strip_trailing_spaces="s/[ ]*\$//" + func_to_host_path_tmp1=`( cmd //c echo "$1" |\ + $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + *cygwin* ) + func_to_host_path_tmp1=`cygpath -w "$1"` + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + * ) + # Unfortunately, winepath does not exit with a non-zero + # error code, so we are forced to check the contents of + # stdout. On the other hand, if the command is not + # found, the shell will set an exit code of 127 and print + # *an error message* to stdout. So we must check for both + # error code of zero AND non-empty stdout, which explains + # the odd construction: + func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` + if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ + $SED -e "$lt_sed_naive_backslashify"` + else + # Allow warning below. + func_to_host_path_result="" + fi + ;; + esac + if test -z "$func_to_host_path_result" ; then + func_error "Could not determine host path corresponding to" + func_error " '$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback: + func_to_host_path_result="$1" + fi + ;; + esac + fi +} +# end: func_to_host_path +# func_to_host_pathlist arg +# +# Convert pathlists to host format when used with build tools. +# See func_to_host_path(), above. This function supports the +# following $build/$host combinations (but does no harm for +# combinations not listed here): +# $build $host +# mingw (msys) mingw [e.g. native] +# cygwin mingw +# *nix + wine mingw +# +# Path separators are also converted from $build format to +# $host format. If ARG begins or ends with a path separator +# character, it is preserved (but converted to $host format) +# on output. +# +# ARG is a pathlist (on $build) that should be converted to +# the proper representation on $host. The result is stored +# in $func_to_host_pathlist_result. +func_to_host_pathlist () +{ + func_to_host_pathlist_result="$1" + if test -n "$1" ; then + case $host in + *mingw* ) + lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + # Remove leading and trailing path separator characters from + # ARG. msys behavior is inconsistent here, cygpath turns them + # into '.;' and ';.', and winepath ignores them completely. + func_to_host_pathlist_tmp2="$1" + # Once set for this call, this variable should not be + # reassigned. It is used in tha fallback case. + func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ + $SED -e 's|^:*||' -e 's|:*$||'` + case $build in + *mingw* ) # Actually, msys. + # Awkward: cmd appends spaces to result. + lt_sed_strip_trailing_spaces="s/[ ]*\$//" + func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ + $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + *cygwin* ) + func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + * ) + # unfortunately, winepath doesn't convert pathlists + func_to_host_pathlist_result="" + func_to_host_pathlist_oldIFS=$IFS + IFS=: + for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do + IFS=$func_to_host_pathlist_oldIFS + if test -n "$func_to_host_pathlist_f" ; then + func_to_host_path "$func_to_host_pathlist_f" + if test -n "$func_to_host_path_result" ; then + if test -z "$func_to_host_pathlist_result" ; then + func_to_host_pathlist_result="$func_to_host_path_result" + else + func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" + fi + fi + fi + IFS=: + done + IFS=$func_to_host_pathlist_oldIFS + ;; + esac + if test -z "$func_to_host_pathlist_result" ; then + func_error "Could not determine the host path(s) corresponding to" + func_error " '$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback. This may break if $1 contains DOS-style drive + # specifications. The fix is not to complicate the expression + # below, but for the user to provide a working wine installation + # with winepath so that path translation in the cross-to-mingw + # case works properly. + lt_replace_pathsep_nix_to_dos="s|:|;|g" + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ + $SED -e "$lt_replace_pathsep_nix_to_dos"` + fi + # Now, add the leading and trailing path separators back + case "$1" in + :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" + ;; + esac + case "$1" in + *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" + ;; + esac + ;; + esac + fi +} +# end: func_to_host_pathlist # func_emit_cwrapperexe_src # emit the source code for a wrapper executable on stdout @@ -4141,71 +3141,41 @@ This wrapper executable should never be moved out of the build directory. If it is, it will not operate correctly. + + Currently, it simply execs the wrapper *script* "$SHELL $output", + but could eventually absorb all of the scripts functionality and + exec $objdir/$outputname directly. */ EOF cat <<"EOF" -#ifdef _MSC_VER -# define _CRT_SECURE_NO_DEPRECATE 1 -#endif #include #include #ifdef _MSC_VER # include # include # include +# define setmode _setmode #else # include # include -# ifdef __CYGWIN__ -# include -# endif -#endif -#include -#include -#include -#include -#include -#include -#include -#include - -/* declarations of non-ANSI functions */ -#if defined(__MINGW32__) -# ifdef __STRICT_ANSI__ -int _putenv (const char *); -# endif -#elif defined(__CYGWIN__) -# ifdef __STRICT_ANSI__ -char *realpath (const char *, char *); -int putenv (char *); -int setenv (const char *, const char *, int); -# endif -/* #elif defined (other platforms) ... */ -#endif - -/* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) -# define setmode _setmode -# define stat _stat -# define chmod _chmod -# define getcwd _getcwd -# define putenv _putenv -# define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int +# ifdef __CYGWIN__ +# include +# define HAVE_SETENV +# ifdef __STRICT_ANSI__ +char *realpath (const char *, char *); +int putenv (char *); +int setenv (const char *, const char *, int); +# endif # endif -#elif defined(__MINGW32__) -# define setmode _setmode -# define stat _stat -# define chmod _chmod -# define getcwd _getcwd -# define putenv _putenv -#elif defined(__CYGWIN__) -# define HAVE_SETENV -# define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ #endif +#include +#include +#include +#include +#include +#include +#include +#include #if defined(PATH_MAX) # define LT_PATHMAX PATH_MAX @@ -4222,7 +3192,14 @@ # define S_IXGRP 0 #endif -/* path handling portability macros */ +#ifdef _MSC_VER +# define S_IXUSR _S_IEXEC +# define stat _stat +# ifndef _INTPTR_T_DEFINED +# define intptr_t int +# endif +#endif + #ifndef DIR_SEPARATOR # define DIR_SEPARATOR '/' # define PATH_SEPARATOR ':' @@ -4253,6 +3230,10 @@ # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) #endif /* PATH_SEPARATOR_2 */ +#ifdef __CYGWIN__ +# define FOPEN_WB "wb" +#endif + #ifndef FOPEN_WB # define FOPEN_WB "w" #endif @@ -4265,13 +3246,22 @@ if (stale) { free ((void *) stale); stale = 0; } \ } while (0) -#if defined(LT_DEBUGWRAPPER) -static int lt_debug = 1; +#undef LTWRAPPER_DEBUGPRINTF +#if defined DEBUGWRAPPER +# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args +static void +ltwrapper_debugprintf (const char *fmt, ...) +{ + va_list args; + va_start (args, fmt); + (void) vfprintf (stderr, fmt, args); + va_end (args); +} #else -static int lt_debug = 0; +# define LTWRAPPER_DEBUGPRINTF(args) #endif -const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ +const char *program_name = NULL; void *xmalloc (size_t num); char *xstrdup (const char *string); @@ -4281,27 +3271,41 @@ int make_executable (const char *path); int check_executable (const char *path); char *strendzap (char *str, const char *pat); -void lt_debugprintf (const char *file, int line, const char *fmt, ...); -void lt_fatal (const char *file, int line, const char *message, ...); -static const char *nonnull (const char *s); -static const char *nonempty (const char *s); +void lt_fatal (const char *message, ...); void lt_setenv (const char *name, const char *value); char *lt_extend_str (const char *orig_value, const char *add, int to_end); +void lt_opt_process_env_set (const char *arg); +void lt_opt_process_env_prepend (const char *arg); +void lt_opt_process_env_append (const char *arg); +int lt_split_name_value (const char *arg, char** name, char** value); void lt_update_exe_path (const char *name, const char *value); void lt_update_lib_path (const char *name, const char *value); -char **prepare_spawn (char **argv); -void lt_dump_script (FILE *f); + +static const char *script_text_part1 = +EOF + + func_emit_wrapper_part1 yes | + $SED -e 's/\([\\"]\)/\\\1/g' \ + -e 's/^/ "/' -e 's/$/\\n"/' + echo ";" + cat <"))); for (i = 0; i < newargc; i++) { - lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", - i, nonnull (newargz[i])); + LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); } EOF @@ -4517,14 +3560,11 @@ mingw*) cat <<"EOF" /* execv doesn't actually work on mingw as expected on unix */ - newargz = prepare_spawn (newargz); rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); if (rval == -1) { /* failed to start process */ - lt_debugprintf (__FILE__, __LINE__, - "(main) failed to launch target \"%s\": %s\n", - lt_argv_zero, nonnull (strerror (errno))); + LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); return 127; } return rval; @@ -4546,7 +3586,7 @@ { void *p = (void *) malloc (num); if (!p) - lt_fatal (__FILE__, __LINE__, "memory exhausted"); + lt_fatal ("Memory exhausted"); return p; } @@ -4580,8 +3620,8 @@ { struct stat st; - lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", - nonempty (path)); + LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", + path ? (*path ? path : "EMPTY!") : "NULL!")); if ((!path) || (!*path)) return 0; @@ -4598,8 +3638,8 @@ int rval = 0; struct stat st; - lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", - nonempty (path)); + LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", + path ? (*path ? path : "EMPTY!") : "NULL!")); if ((!path) || (!*path)) return 0; @@ -4625,8 +3665,8 @@ int tmp_len; char *concat_name; - lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", - nonempty (wrapper)); + LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", + wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); if ((wrapper == NULL) || (*wrapper == '\0')) return NULL; @@ -4679,8 +3719,7 @@ { /* empty path: current directory */ if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - nonnull (strerror (errno))); + lt_fatal ("getcwd failed"); tmp_len = strlen (tmp); concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); @@ -4705,8 +3744,7 @@ } /* Relative path | not found in path: prepend cwd */ if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - nonnull (strerror (errno))); + lt_fatal ("getcwd failed"); tmp_len = strlen (tmp); concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); memcpy (concat_name, tmp, tmp_len); @@ -4732,9 +3770,8 @@ int has_symlinks = 0; while (strlen (tmp_pathspec) && !has_symlinks) { - lt_debugprintf (__FILE__, __LINE__, - "checking path component for symlinks: %s\n", - tmp_pathspec); + LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", + tmp_pathspec)); if (lstat (tmp_pathspec, &s) == 0) { if (S_ISLNK (s.st_mode) != 0) @@ -4756,9 +3793,8 @@ } else { - lt_fatal (__FILE__, __LINE__, - "error accessing file \"%s\": %s", - tmp_pathspec, nonnull (strerror (errno))); + char *errstr = strerror (errno); + lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); } } XFREE (tmp_pathspec); @@ -4771,8 +3807,7 @@ tmp_pathspec = realpath (pathspec, buf); if (tmp_pathspec == 0) { - lt_fatal (__FILE__, __LINE__, - "could not follow symlinks for %s", pathspec); + lt_fatal ("Could not follow symlinks for %s", pathspec); } return xstrdup (tmp_pathspec); #endif @@ -4798,25 +3833,11 @@ return str; } -void -lt_debugprintf (const char *file, int line, const char *fmt, ...) -{ - va_list args; - if (lt_debug) - { - (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); - va_start (args, fmt); - (void) vfprintf (stderr, fmt, args); - va_end (args); - } -} - static void -lt_error_core (int exit_status, const char *file, - int line, const char *mode, +lt_error_core (int exit_status, const char *mode, const char *message, va_list ap) { - fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); + fprintf (stderr, "%s: %s: ", program_name, mode); vfprintf (stderr, message, ap); fprintf (stderr, ".\n"); @@ -4825,32 +3846,20 @@ } void -lt_fatal (const char *file, int line, const char *message, ...) +lt_fatal (const char *message, ...) { va_list ap; va_start (ap, message); - lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); + lt_error_core (EXIT_FAILURE, "FATAL", message, ap); va_end (ap); } -static const char * -nonnull (const char *s) -{ - return s ? s : "(null)"; -} - -static const char * -nonempty (const char *s) -{ - return (s && !*s) ? "(empty)" : nonnull (s); -} - void lt_setenv (const char *name, const char *value) { - lt_debugprintf (__FILE__, __LINE__, - "(lt_setenv) setting '%s' to '%s'\n", - nonnull (name), nonnull (value)); + LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", + (name ? name : ""), + (value ? value : ""))); { #ifdef HAVE_SETENV /* always make a copy, for consistency with !HAVE_SETENV */ @@ -4895,12 +3904,95 @@ return new_value; } +int +lt_split_name_value (const char *arg, char** name, char** value) +{ + const char *p; + int len; + if (!arg || !*arg) + return 1; + + p = strchr (arg, (int)'='); + + if (!p) + return 1; + + *value = xstrdup (++p); + + len = strlen (arg) - strlen (*value); + *name = XMALLOC (char, len); + strncpy (*name, arg, len-1); + (*name)[len - 1] = '\0'; + + return 0; +} + +void +lt_opt_process_env_set (const char *arg) +{ + char *name = NULL; + char *value = NULL; + + if (lt_split_name_value (arg, &name, &value) != 0) + { + XFREE (name); + XFREE (value); + lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); + } + + lt_setenv (name, value); + XFREE (name); + XFREE (value); +} + +void +lt_opt_process_env_prepend (const char *arg) +{ + char *name = NULL; + char *value = NULL; + char *new_value = NULL; + + if (lt_split_name_value (arg, &name, &value) != 0) + { + XFREE (name); + XFREE (value); + lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); + } + + new_value = lt_extend_str (getenv (name), value, 0); + lt_setenv (name, new_value); + XFREE (new_value); + XFREE (name); + XFREE (value); +} + +void +lt_opt_process_env_append (const char *arg) +{ + char *name = NULL; + char *value = NULL; + char *new_value = NULL; + + if (lt_split_name_value (arg, &name, &value) != 0) + { + XFREE (name); + XFREE (value); + lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); + } + + new_value = lt_extend_str (getenv (name), value, 1); + lt_setenv (name, new_value); + XFREE (new_value); + XFREE (name); + XFREE (value); +} + void lt_update_exe_path (const char *name, const char *value) { - lt_debugprintf (__FILE__, __LINE__, - "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", - nonnull (name), nonnull (value)); + LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", + (name ? name : ""), + (value ? value : ""))); if (name && *name && value && *value) { @@ -4919,9 +4011,9 @@ void lt_update_lib_path (const char *name, const char *value) { - lt_debugprintf (__FILE__, __LINE__, - "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", - nonnull (name), nonnull (value)); + LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", + (name ? name : ""), + (value ? value : ""))); if (name && *name && value && *value) { @@ -4931,152 +4023,11 @@ } } -EOF - case $host_os in - mingw*) - cat <<"EOF" - -/* Prepares an argument vector before calling spawn(). - Note that spawn() does not by itself call the command interpreter - (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : - ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&v); - v.dwPlatformId == VER_PLATFORM_WIN32_NT; - }) ? "cmd.exe" : "command.com"). - Instead it simply concatenates the arguments, separated by ' ', and calls - CreateProcess(). We must quote the arguments since Win32 CreateProcess() - interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a - special way: - - Space and tab are interpreted as delimiters. They are not treated as - delimiters if they are surrounded by double quotes: "...". - - Unescaped double quotes are removed from the input. Their only effect is - that within double quotes, space and tab are treated like normal - characters. - - Backslashes not followed by double quotes are not special. - - But 2*n+1 backslashes followed by a double quote become - n backslashes followed by a double quote (n >= 0): - \" -> " - \\\" -> \" - \\\\\" -> \\" - */ -#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -char ** -prepare_spawn (char **argv) -{ - size_t argc; - char **new_argv; - size_t i; - - /* Count number of arguments. */ - for (argc = 0; argv[argc] != NULL; argc++) - ; - - /* Allocate new argument vector. */ - new_argv = XMALLOC (char *, argc + 1); - - /* Put quoted arguments into the new argument vector. */ - for (i = 0; i < argc; i++) - { - const char *string = argv[i]; - - if (string[0] == '\0') - new_argv[i] = xstrdup ("\"\""); - else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) - { - int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); - size_t length; - unsigned int backslashes; - const char *s; - char *quoted_string; - char *p; - - length = 0; - backslashes = 0; - if (quote_around) - length++; - for (s = string; *s != '\0'; s++) - { - char c = *s; - if (c == '"') - length += backslashes + 1; - length++; - if (c == '\\') - backslashes++; - else - backslashes = 0; - } - if (quote_around) - length += backslashes + 1; - - quoted_string = XMALLOC (char, length + 1); - - p = quoted_string; - backslashes = 0; - if (quote_around) - *p++ = '"'; - for (s = string; *s != '\0'; s++) - { - char c = *s; - if (c == '"') - { - unsigned int j; - for (j = backslashes + 1; j > 0; j--) - *p++ = '\\'; - } - *p++ = c; - if (c == '\\') - backslashes++; - else - backslashes = 0; - } - if (quote_around) - { - unsigned int j; - for (j = backslashes; j > 0; j--) - *p++ = '\\'; - *p++ = '"'; - } - *p = '\0'; - - new_argv[i] = quoted_string; - } - else - new_argv[i] = (char *) string; - } - new_argv[argc] = NULL; - - return new_argv; -} -EOF - ;; - esac - - cat <<"EOF" -void lt_dump_script (FILE* f) -{ -EOF - func_emit_wrapper yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' - cat <<"EOF" -} EOF } # end: func_emit_cwrapperexe_src -# func_win32_import_lib_p ARG -# True if ARG is an import lib, as indicated by $file_magic_cmd -func_win32_import_lib_p () -{ - $opt_debug - case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in - *import*) : ;; - *) false ;; - esac -} - # func_mode_link arg... func_mode_link () { @@ -5121,7 +4072,6 @@ new_inherited_linker_flags= avoid_version=no - bindir= dlfiles= dlprefiles= dlself=no @@ -5214,11 +4164,6 @@ esac case $prev in - bindir) - bindir="$arg" - prev= - continue - ;; dlfiles|dlprefiles) if test "$preload" = no; then # Add the symbol object into the linking commands. @@ -5250,9 +4195,9 @@ ;; *) if test "$prev" = dlfiles; then - func_append dlfiles " $arg" + dlfiles="$dlfiles $arg" else - func_append dlprefiles " $arg" + dlprefiles="$dlprefiles $arg" fi prev= continue @@ -5276,7 +4221,7 @@ *-*-darwin*) case "$deplibs " in *" $qarg.ltframework "*) ;; - *) func_append deplibs " $qarg.ltframework" # this is fixed later + *) deplibs="$deplibs $qarg.ltframework" # this is fixed later ;; esac ;; @@ -5295,7 +4240,7 @@ moreargs= for fil in `cat "$save_arg"` do -# func_append moreargs " $fil" +# moreargs="$moreargs $fil" arg=$fil # A libtool-controlled object. @@ -5324,7 +4269,7 @@ if test "$prev" = dlfiles; then if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - func_append dlfiles " $pic_object" + dlfiles="$dlfiles $pic_object" prev= continue else @@ -5336,7 +4281,7 @@ # CHECK ME: I think I busted this. -Ossama if test "$prev" = dlprefiles; then # Preload the old-style object. - func_append dlprefiles " $pic_object" + dlprefiles="$dlprefiles $pic_object" prev= fi @@ -5406,12 +4351,12 @@ if test "$prev" = rpath; then case "$rpath " in *" $arg "*) ;; - *) func_append rpath " $arg" ;; + *) rpath="$rpath $arg" ;; esac else case "$xrpath " in *" $arg "*) ;; - *) func_append xrpath " $arg" ;; + *) xrpath="$xrpath $arg" ;; esac fi prev= @@ -5423,28 +4368,28 @@ continue ;; weak) - func_append weak_libs " $arg" + weak_libs="$weak_libs $arg" prev= continue ;; xcclinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $qarg" + linker_flags="$linker_flags $qarg" + compiler_flags="$compiler_flags $qarg" prev= func_append compile_command " $qarg" func_append finalize_command " $qarg" continue ;; xcompiler) - func_append compiler_flags " $qarg" + compiler_flags="$compiler_flags $qarg" prev= func_append compile_command " $qarg" func_append finalize_command " $qarg" continue ;; xlinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $wl$qarg" + linker_flags="$linker_flags $qarg" + compiler_flags="$compiler_flags $wl$qarg" prev= func_append compile_command " $wl$qarg" func_append finalize_command " $wl$qarg" @@ -5480,11 +4425,6 @@ continue ;; - -bindir) - prev=bindir - continue - ;; - -dlopen) prev=dlfiles continue @@ -5535,16 +4475,15 @@ ;; -L*) - func_stripname "-L" '' "$arg" - if test -z "$func_stripname_result"; then + func_stripname '-L' '' "$arg" + dir=$func_stripname_result + if test -z "$dir"; then if test "$#" -gt 0; then func_fatal_error "require no space between \`-L' and \`$1'" else func_fatal_error "need path for \`-L' option" fi fi - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -5556,30 +4495,24 @@ ;; esac case "$deplibs " in - *" -L$dir "* | *" $arg "*) - # Will only happen for absolute or sysroot arguments - ;; + *" -L$dir "*) ;; *) - # Preserve sysroot, but never include relative directories - case $dir in - [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; - *) func_append deplibs " -L$dir" ;; - esac - func_append lib_search_path " $dir" + deplibs="$deplibs -L$dir" + lib_search_path="$lib_search_path $dir" ;; esac case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` + testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; ::) dllsearchpath=$dir;; - *) func_append dllsearchpath ":$dir";; + *) dllsearchpath="$dllsearchpath:$dir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; ::) dllsearchpath=$testbindir;; - *) func_append dllsearchpath ":$testbindir";; + *) dllsearchpath="$dllsearchpath:$testbindir";; esac ;; esac @@ -5589,7 +4522,7 @@ -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) # These systems don't actually have a C or math library (as such) continue ;; @@ -5603,7 +4536,7 @@ ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework - func_append deplibs " System.ltframework" + deplibs="$deplibs System.ltframework" continue ;; *-*-sco3.2v5* | *-*-sco5v6*) @@ -5623,7 +4556,7 @@ ;; esac fi - func_append deplibs " $arg" + deplibs="$deplibs $arg" continue ;; @@ -5635,8 +4568,8 @@ # Tru64 UNIX uses -model [arg] to determine the layout of C++ # classes, name mangling, and exception handling. # Darwin uses the -arch flag to determine output architecture. - -model|-arch|-isysroot|--sysroot) - func_append compiler_flags " $arg" + -model|-arch|-isysroot) + compiler_flags="$compiler_flags $arg" func_append compile_command " $arg" func_append finalize_command " $arg" prev=xcompiler @@ -5644,12 +4577,12 @@ ;; -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - func_append compiler_flags " $arg" + compiler_flags="$compiler_flags $arg" func_append compile_command " $arg" func_append finalize_command " $arg" case "$new_inherited_linker_flags " in *" $arg "*) ;; - * ) func_append new_inherited_linker_flags " $arg" ;; + * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; esac continue ;; @@ -5716,17 +4649,13 @@ # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) ;; - =*) - func_stripname '=' '' "$dir" - dir=$lt_sysroot$func_stripname_result - ;; *) func_fatal_error "only absolute run-paths are allowed" ;; esac case "$xrpath " in *" $dir "*) ;; - *) func_append xrpath " $dir" ;; + *) xrpath="$xrpath $dir" ;; esac continue ;; @@ -5779,8 +4708,8 @@ for flag in $args; do IFS="$save_ifs" func_quote_for_eval "$flag" - func_append arg " $func_quote_for_eval_result" - func_append compiler_flags " $func_quote_for_eval_result" + arg="$arg $wl$func_quote_for_eval_result" + compiler_flags="$compiler_flags $func_quote_for_eval_result" done IFS="$save_ifs" func_stripname ' ' '' "$arg" @@ -5795,9 +4724,9 @@ for flag in $args; do IFS="$save_ifs" func_quote_for_eval "$flag" - func_append arg " $wl$func_quote_for_eval_result" - func_append compiler_flags " $wl$func_quote_for_eval_result" - func_append linker_flags " $func_quote_for_eval_result" + arg="$arg $wl$func_quote_for_eval_result" + compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" + linker_flags="$linker_flags $func_quote_for_eval_result" done IFS="$save_ifs" func_stripname ' ' '' "$arg" @@ -5825,27 +4754,23 @@ arg="$func_quote_for_eval_result" ;; - # Flags to be passed through unchanged, with rationale: - # -64, -mips[0-9] enable 64-bit mode for the SGI compiler - # -r[0-9][0-9]* specify processor for the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler - # +DA*, +DD* enable 64-bit mode for the HP compiler - # -q* compiler args for the IBM compiler - # -m*, -t[45]*, -txscale* architecture-specific flags for GCC - # -F/path path to uninstalled frameworks, gcc on darwin - # -p, -pg, --coverage, -fprofile-* profiling flags for GCC - # @file GCC response files - # -tp=* Portland pgcc target processor selection - # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -64, -mips[0-9] enable 64-bit mode on the SGI compiler + # -r[0-9][0-9]* specifies the processor on the SGI compiler + # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler + # +DA*, +DD* enable 64-bit mode on the HP compiler + # -q* pass through compiler args for the IBM compiler + # -m*, -t[45]*, -txscale* pass through architecture-specific + # compiler args for GCC + # -F/path gives path to uninstalled frameworks, gcc on darwin + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" func_append finalize_command " $arg" - func_append compiler_flags " $arg" + compiler_flags="$compiler_flags $arg" continue ;; @@ -5857,7 +4782,7 @@ *.$objext) # A standard object. - func_append objs " $arg" + objs="$objs $arg" ;; *.lo) @@ -5888,7 +4813,7 @@ if test "$prev" = dlfiles; then if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - func_append dlfiles " $pic_object" + dlfiles="$dlfiles $pic_object" prev= continue else @@ -5900,7 +4825,7 @@ # CHECK ME: I think I busted this. -Ossama if test "$prev" = dlprefiles; then # Preload the old-style object. - func_append dlprefiles " $pic_object" + dlprefiles="$dlprefiles $pic_object" prev= fi @@ -5945,25 +4870,24 @@ *.$libext) # An archive. - func_append deplibs " $arg" - func_append old_deplibs " $arg" + deplibs="$deplibs $arg" + old_deplibs="$old_deplibs $arg" continue ;; *.la) # A libtool-controlled library. - func_resolve_sysroot "$arg" if test "$prev" = dlfiles; then # This library was specified with -dlopen. - func_append dlfiles " $func_resolve_sysroot_result" + dlfiles="$dlfiles $arg" prev= elif test "$prev" = dlprefiles; then # The library was specified with -dlpreopen. - func_append dlprefiles " $func_resolve_sysroot_result" + dlprefiles="$dlprefiles $arg" prev= else - func_append deplibs " $func_resolve_sysroot_result" + deplibs="$deplibs $arg" fi continue ;; @@ -6001,7 +4925,7 @@ if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` else shlib_search_path= fi @@ -6010,8 +4934,6 @@ func_dirname "$output" "/" "" output_objdir="$func_dirname_result$objdir" - func_to_tool_file "$output_objdir/" - tool_output_objdir=$func_to_tool_file_result # Create the object directory. func_mkdir_p "$output_objdir" @@ -6032,12 +4954,12 @@ # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then + if $opt_duplicate_deps ; then case "$libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; esac fi - func_append libs " $deplib" + libs="$libs $deplib" done if test "$linkmode" = lib; then @@ -6050,9 +4972,9 @@ if $opt_duplicate_compiler_generated_deps; then for pre_post_dep in $predeps $postdeps; do case "$pre_post_deps " in - *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; + *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; esac - func_append pre_post_deps " $pre_post_dep" + pre_post_deps="$pre_post_deps $pre_post_dep" done fi pre_post_deps= @@ -6122,19 +5044,17 @@ for lib in $dlprefiles; do # Ignore non-libtool-libs dependency_libs= - func_resolve_sysroot "$lib" case $lib in - *.la) func_source "$func_resolve_sysroot_result" ;; + *.la) func_source "$lib" ;; esac # Collect preopened libtool deplibs, except any this library # has declared as weak libs for deplib in $dependency_libs; do - func_basename "$deplib" - deplib_base=$func_basename_result + deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` case " $weak_libs " in *" $deplib_base "*) ;; - *) func_append deplibs " $deplib" ;; + *) deplibs="$deplibs $deplib" ;; esac done done @@ -6155,11 +5075,11 @@ compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - func_append compiler_flags " $deplib" + compiler_flags="$compiler_flags $deplib" if test "$linkmode" = lib ; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; + * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; esac fi fi @@ -6244,7 +5164,7 @@ if test "$linkmode" = lib ; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; + * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; esac fi fi @@ -6257,8 +5177,7 @@ test "$pass" = conv && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" + newlib_search_path="$newlib_search_path $func_stripname_result" ;; prog) if test "$pass" = conv; then @@ -6272,8 +5191,7 @@ finalize_deplibs="$deplib $finalize_deplibs" fi func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" + newlib_search_path="$newlib_search_path $func_stripname_result" ;; *) func_warning "\`-L' is ignored for archives/objects" @@ -6284,21 +5202,17 @@ -R*) if test "$pass" = link; then func_stripname '-R' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result + dir=$func_stripname_result # Make sure the xrpath contains only unique directories. case "$xrpath " in *" $dir "*) ;; - *) func_append xrpath " $dir" ;; + *) xrpath="$xrpath $dir" ;; esac fi deplibs="$deplib $deplibs" continue ;; - *.la) - func_resolve_sysroot "$deplib" - lib=$func_resolve_sysroot_result - ;; + *.la) lib="$deplib" ;; *.$libext) if test "$pass" = conv; then deplibs="$deplib $deplibs" @@ -6316,7 +5230,7 @@ match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ + if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then valid_a_lib=yes fi @@ -6326,15 +5240,15 @@ ;; esac if test "$valid_a_lib" != yes; then - echo + $ECHO $ECHO "*** Warning: Trying to link with static lib archive $deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because the file extensions .$libext of this argument makes me believe" - echo "*** that it is just a static archive that I should not use here." + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have" + $ECHO "*** because the file extensions .$libext of this argument makes me believe" + $ECHO "*** that it is just a static archive that I should not use here." else - echo + $ECHO $ECHO "*** Warning: Linking the shared library $output against the" $ECHO "*** static library $deplib is not portable!" deplibs="$deplib $deplibs" @@ -6361,11 +5275,11 @@ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then # If there is no dlopen support or we're linking statically, # we need to preload. - func_append newdlprefiles " $deplib" + newdlprefiles="$newdlprefiles $deplib" compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - func_append newdlfiles " $deplib" + newdlfiles="$newdlfiles $deplib" fi fi continue @@ -6407,20 +5321,20 @@ # Convert "-framework foo" to "foo.ltframework" if test -n "$inherited_linker_flags"; then - tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` + tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do case " $new_inherited_linker_flags " in *" $tmp_inherited_linker_flag "*) ;; - *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; + *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; esac done fi - dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` if test "$linkmode,$pass" = "lib,link" || test "$linkmode,$pass" = "prog,scan" || { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && func_append dlfiles " $dlopen" - test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" + test -n "$dlopen" && dlfiles="$dlfiles $dlopen" + test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" fi if test "$pass" = conv; then @@ -6431,36 +5345,30 @@ func_fatal_error "cannot find name of link library for \`$lib'" fi # It is a libtool convenience library, so add in its objects. - func_append convenience " $ladir/$objdir/$old_library" - func_append old_convenience " $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done + convenience="$convenience $ladir/$objdir/$old_library" + old_convenience="$old_convenience $ladir/$objdir/$old_library" elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_duplicate_deps ; then + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi + tmp_libs="$tmp_libs $deplib" + done continue fi # $pass = conv # Get the name of the library we link against. linklib= - if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then - linklib=$old_library - else - for l in $old_library $library_names; do - linklib="$l" - done - fi + for l in $old_library $library_names; do + linklib="$l" + done if test -z "$linklib"; then func_fatal_error "cannot find name of link library for \`$lib'" fi @@ -6477,9 +5385,9 @@ # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't # bomb out in the load deplibs phase. - func_append dlprefiles " $lib $dependency_libs" + dlprefiles="$dlprefiles $lib $dependency_libs" else - func_append newdlfiles " $lib" + newdlfiles="$newdlfiles $lib" fi continue fi # $pass = dlopen @@ -6501,14 +5409,14 @@ # Find the relevant object directory and library name. if test "X$installed" = Xyes; then - if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then + if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then func_warning "library \`$lib' was moved." dir="$ladir" absdir="$abs_ladir" libdir="$abs_ladir" else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" + dir="$libdir" + absdir="$libdir" fi test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes else @@ -6516,12 +5424,12 @@ dir="$ladir" absdir="$abs_ladir" # Remove this search path later - func_append notinst_path " $abs_ladir" + notinst_path="$notinst_path $abs_ladir" else dir="$ladir/$objdir" absdir="$abs_ladir/$objdir" # Remove this search path later - func_append notinst_path " $abs_ladir" + notinst_path="$notinst_path $abs_ladir" fi fi # $installed = yes func_stripname 'lib' '.la' "$laname" @@ -6532,46 +5440,20 @@ if test -z "$libdir" && test "$linkmode" = prog; then func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" fi - case "$host" in - # special handling for platforms with PE-DLLs. - *cygwin* | *mingw* | *cegcc* ) - # Linker will automatically link against shared library if both - # static and shared are present. Therefore, ensure we extract - # symbols from the import library if a shared library is present - # (otherwise, the dlopen module name will be incorrect). We do - # this by putting the import library name into $newdlprefiles. - # We recover the dlopen module name by 'saving' the la file - # name in a special purpose variable, and (later) extracting the - # dlname from the la file. - if test -n "$dlname"; then - func_tr_sh "$dir/$linklib" - eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" - func_append newdlprefiles " $dir/$linklib" - else - func_append newdlprefiles " $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - func_append dlpreconveniencelibs " $dir/$old_library" - fi - ;; - * ) - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - func_append newdlprefiles " $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - func_append dlpreconveniencelibs " $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - func_append newdlprefiles " $dir/$dlname" - else - func_append newdlprefiles " $dir/$linklib" - fi - ;; - esac + # Prefer using a static library (so that no silly _DYNAMIC symbols + # are required to link). + if test -n "$old_library"; then + newdlprefiles="$newdlprefiles $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" + # Otherwise, use the dlname, so that lt_dlopen finds it. + elif test -n "$dlname"; then + newdlprefiles="$newdlprefiles $dir/$dlname" + else + newdlprefiles="$newdlprefiles $dir/$linklib" + fi fi # $pass = dlpreopen if test -z "$libdir"; then @@ -6589,7 +5471,7 @@ if test "$linkmode" = prog && test "$pass" != link; then - func_append newlib_search_path " $ladir" + newlib_search_path="$newlib_search_path $ladir" deplibs="$lib $deplibs" linkalldeplibs=no @@ -6602,8 +5484,7 @@ for deplib in $dependency_libs; do case $deplib in -L*) func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" + newlib_search_path="$newlib_search_path $func_stripname_result" ;; esac # Need to link against all dependency_libs? @@ -6614,12 +5495,12 @@ # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_preserve_dup_deps ; then + if $opt_duplicate_deps ; then case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; esac fi - func_append tmp_libs " $deplib" + tmp_libs="$tmp_libs $deplib" done # for deplib continue fi # $linkmode = prog... @@ -6634,7 +5515,7 @@ # Make sure the rpath contains only unique directories. case "$temp_rpath:" in *"$absdir:"*) ;; - *) func_append temp_rpath "$absdir:" ;; + *) temp_rpath="$temp_rpath$absdir:" ;; esac fi @@ -6646,7 +5527,7 @@ *) case "$compile_rpath " in *" $absdir "*) ;; - *) func_append compile_rpath " $absdir" ;; + *) compile_rpath="$compile_rpath $absdir" esac ;; esac @@ -6655,7 +5536,7 @@ *) case "$finalize_rpath " in *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; + *) finalize_rpath="$finalize_rpath $libdir" esac ;; esac @@ -6680,12 +5561,12 @@ case $host in *cygwin* | *mingw* | *cegcc*) # No point in relinking DLLs because paths are not encoded - func_append notinst_deplibs " $lib" + notinst_deplibs="$notinst_deplibs $lib" need_relink=no ;; *) if test "$installed" = no; then - func_append notinst_deplibs " $lib" + notinst_deplibs="$notinst_deplibs $lib" need_relink=yes fi ;; @@ -6702,7 +5583,7 @@ fi done if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then - echo + $ECHO if test "$linkmode" = prog; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else @@ -6720,7 +5601,7 @@ *) case "$compile_rpath " in *" $absdir "*) ;; - *) func_append compile_rpath " $absdir" ;; + *) compile_rpath="$compile_rpath $absdir" esac ;; esac @@ -6729,7 +5610,7 @@ *) case "$finalize_rpath " in *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; + *) finalize_rpath="$finalize_rpath $libdir" esac ;; esac @@ -6783,7 +5664,7 @@ linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test "$linkmode" = prog || test "$opt_mode" != relink; then + if test "$linkmode" = prog || test "$mode" != relink; then add_shlibpath= add_dir= add= @@ -6805,9 +5686,9 @@ if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" if test -z "$old_library" ; then - echo - echo "*** And there doesn't seem to be a static archive available" - echo "*** The link will probably fail, sorry" + $ECHO + $ECHO "*** And there doesn't seem to be a static archive available" + $ECHO "*** The link will probably fail, sorry" else add="$dir/$old_library" fi @@ -6839,7 +5720,7 @@ if test -n "$inst_prefix_dir"; then case $libdir in [\\/]*) - func_append add_dir " -L$inst_prefix_dir$libdir" + add_dir="$add_dir -L$inst_prefix_dir$libdir" ;; esac fi @@ -6861,7 +5742,7 @@ if test -n "$add_shlibpath"; then case :$compile_shlibpath: in *":$add_shlibpath:"*) ;; - *) func_append compile_shlibpath "$add_shlibpath:" ;; + *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; esac fi if test "$linkmode" = prog; then @@ -6875,13 +5756,13 @@ test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; + *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; esac fi fi fi - if test "$linkmode" = prog || test "$opt_mode" = relink; then + if test "$linkmode" = prog || test "$mode" = relink; then add_shlibpath= add_dir= add= @@ -6895,7 +5776,7 @@ elif test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; + *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; esac add="-l$name" elif test "$hardcode_automatic" = yes; then @@ -6912,7 +5793,7 @@ if test -n "$inst_prefix_dir"; then case $libdir in [\\/]*) - func_append add_dir " -L$inst_prefix_dir$libdir" + add_dir="$add_dir -L$inst_prefix_dir$libdir" ;; esac fi @@ -6947,21 +5828,21 @@ # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. - echo + $ECHO $ECHO "*** Warning: This system can not link to static lib archive $lib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have." + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have." if test "$module" = yes; then - echo "*** But as you try to build a module library, libtool will still create " - echo "*** a static module, that should work as long as the dlopening application" - echo "*** is linked with the -dlopen flag to resolve symbols at runtime." + $ECHO "*** But as you try to build a module library, libtool will still create " + $ECHO "*** a static module, that should work as long as the dlopening application" + $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + $ECHO + $ECHO "*** However, this would only work if libtool was able to extract symbol" + $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" + $ECHO "*** not find such a program. So, this module is probably useless." + $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then build_libtool_libs=module @@ -6989,46 +5870,37 @@ temp_xrpath=$func_stripname_result case " $xrpath " in *" $temp_xrpath "*) ;; - *) func_append xrpath " $temp_xrpath";; + *) xrpath="$xrpath $temp_xrpath";; esac;; - *) func_append temp_deplibs " $libdir";; + *) temp_deplibs="$temp_deplibs $libdir";; esac done dependency_libs="$temp_deplibs" fi - func_append newlib_search_path " $absdir" + newlib_search_path="$newlib_search_path $absdir" # Link against this library test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs tmp_libs= for deplib in $dependency_libs; do newdependency_libs="$deplib $newdependency_libs" - case $deplib in - -L*) func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result";; - *) func_resolve_sysroot "$deplib" ;; - esac - if $opt_preserve_dup_deps ; then + if $opt_duplicate_deps ; then case "$tmp_libs " in - *" $func_resolve_sysroot_result "*) - func_append specialdeplibs " $func_resolve_sysroot_result" ;; + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; esac fi - func_append tmp_libs " $func_resolve_sysroot_result" + tmp_libs="$tmp_libs $deplib" done if test "$link_all_deplibs" != no; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do - path= case $deplib in -L*) path="$deplib" ;; *.la) - func_resolve_sysroot "$deplib" - deplib=$func_resolve_sysroot_result func_dirname "$deplib" "" "." - dir=$func_dirname_result + dir="$func_dirname_result" # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; @@ -7055,8 +5927,8 @@ if test -z "$darwin_install_name"; then darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" + linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" path= fi fi @@ -7089,7 +5961,7 @@ compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else - compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi dependency_libs="$newdependency_libs" @@ -7106,7 +5978,7 @@ for dir in $newlib_search_path; do case "$lib_search_path " in *" $dir "*) ;; - *) func_append lib_search_path " $dir" ;; + *) lib_search_path="$lib_search_path $dir" ;; esac done newlib_search_path= @@ -7164,10 +6036,10 @@ -L*) case " $tmp_libs " in *" $deplib "*) ;; - *) func_append tmp_libs " $deplib" ;; + *) tmp_libs="$tmp_libs $deplib" ;; esac ;; - *) func_append tmp_libs " $deplib" ;; + *) tmp_libs="$tmp_libs $deplib" ;; esac done eval $var=\"$tmp_libs\" @@ -7183,7 +6055,7 @@ ;; esac if test -n "$i" ; then - func_append tmp_libs " $i" + tmp_libs="$tmp_libs $i" fi done dependency_libs=$tmp_libs @@ -7224,7 +6096,7 @@ # Now set the variables for building old libraries. build_libtool_libs=no oldlibs="$output" - func_append objs "$old_deplibs" + objs="$objs$old_deplibs" ;; lib) @@ -7257,10 +6129,10 @@ if test "$deplibs_check_method" != pass_all; then func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" else - echo + $ECHO $ECHO "*** Warning: Linking the shared library $output against the non-libtool" $ECHO "*** objects $objs is not portable!" - func_append libobjs " $objs" + libobjs="$libobjs $objs" fi fi @@ -7325,7 +6197,7 @@ age="$number_minor" revision="$number_revision" ;; - freebsd-aout|freebsd-elf|qnx|sunos) + freebsd-aout|freebsd-elf|sunos) current="$number_major" revision="$number_minor" age="0" @@ -7461,7 +6333,7 @@ done # Make executables depend on our current version. - func_append verstring ":${current}.0" + verstring="$verstring:${current}.0" ;; qnx) @@ -7529,10 +6401,10 @@ fi func_generate_dlsyms "$libname" "$libname" "yes" - func_append libobjs " $symfileobj" + libobjs="$libobjs $symfileobj" test "X$libobjs" = "X " && libobjs= - if test "$opt_mode" != relink; then + if test "$mode" != relink; then # Remove our outputs, but don't remove object files since they # may have been created when compiling PIC objects. removelist= @@ -7548,7 +6420,7 @@ continue fi fi - func_append removelist " $p" + removelist="$removelist $p" ;; *) ;; esac @@ -7559,28 +6431,27 @@ # Now set the variables for building old libraries. if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - func_append oldlibs " $output_objdir/$libname.$libext" + oldlibs="$oldlibs $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` fi # Eliminate all temporary directories. #for path in $notinst_path; do - # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` - # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` - # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` + # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` + # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` + # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` #done if test -n "$xrpath"; then # If the user specified any rpath flags, then add them. temp_xrpath= for libdir in $xrpath; do - func_replace_sysroot "$libdir" - func_append temp_xrpath " -R$func_replace_sysroot_result" + temp_xrpath="$temp_xrpath -R$libdir" case "$finalize_rpath " in *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; + *) finalize_rpath="$finalize_rpath $libdir" ;; esac done if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then @@ -7594,7 +6465,7 @@ for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in *" $lib "*) ;; - *) func_append dlfiles " $lib" ;; + *) dlfiles="$dlfiles $lib" ;; esac done @@ -7604,19 +6475,19 @@ for lib in $old_dlprefiles; do case "$dlprefiles " in *" $lib "*) ;; - *) func_append dlprefiles " $lib" ;; + *) dlprefiles="$dlprefiles $lib" ;; esac done if test "$build_libtool_libs" = yes; then if test -n "$rpath"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) # these systems don't actually have a c library (as such)! ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C library is in the System framework - func_append deplibs " System.ltframework" + deplibs="$deplibs System.ltframework" ;; *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. @@ -7633,7 +6504,7 @@ *) # Add libc to deplibs on all other systems if necessary. if test "$build_libtool_need_lc" = "yes"; then - func_append deplibs " -lc" + deplibs="$deplibs -lc" fi ;; esac @@ -7682,7 +6553,7 @@ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) - func_append newdeplibs " $i" + newdeplibs="$newdeplibs $i" i="" ;; esac @@ -7693,21 +6564,21 @@ set dummy $deplib_matches; shift deplib_match=$1 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - func_append newdeplibs " $i" + newdeplibs="$newdeplibs $i" else droppeddeps=yes - echo + $ECHO $ECHO "*** Warning: dynamic linker does not accept needed library $i." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which I believe you do not have" - echo "*** because a test_compile did reveal that the linker did not use it for" - echo "*** its dynamic dependency list that programs get resolved with at runtime." + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which I believe you do not have" + $ECHO "*** because a test_compile did reveal that the linker did not use it for" + $ECHO "*** its dynamic dependency list that programs get resolved with at runtime." fi fi ;; *) - func_append newdeplibs " $i" + newdeplibs="$newdeplibs $i" ;; esac done @@ -7725,7 +6596,7 @@ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) - func_append newdeplibs " $i" + newdeplibs="$newdeplibs $i" i="" ;; esac @@ -7736,29 +6607,29 @@ set dummy $deplib_matches; shift deplib_match=$1 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - func_append newdeplibs " $i" + newdeplibs="$newdeplibs $i" else droppeddeps=yes - echo + $ECHO $ECHO "*** Warning: dynamic linker does not accept needed library $i." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because a test_compile did reveal that the linker did not use this one" - echo "*** as a dynamic dependency that programs can get resolved with at runtime." + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have" + $ECHO "*** because a test_compile did reveal that the linker did not use this one" + $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime." fi fi else droppeddeps=yes - echo + $ECHO $ECHO "*** Warning! Library $i is needed by this library but I was not able to" - echo "*** make it link in! You will probably need to install it or some" - echo "*** library that it depends on before this library will be fully" - echo "*** functional. Installing it before continuing would be even better." + $ECHO "*** make it link in! You will probably need to install it or some" + $ECHO "*** library that it depends on before this library will be fully" + $ECHO "*** functional. Installing it before continuing would be even better." fi ;; *) - func_append newdeplibs " $i" + newdeplibs="$newdeplibs $i" ;; esac done @@ -7775,27 +6646,15 @@ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) - func_append newdeplibs " $a_deplib" + newdeplibs="$newdeplibs $a_deplib" a_deplib="" ;; esac fi if test -n "$a_deplib" ; then libname=`eval "\\$ECHO \"$libname_spec\""` - if test -n "$file_magic_glob"; then - libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` - else - libnameglob=$libname - fi - test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - if test "$want_nocaseglob" = yes; then - shopt -s nocaseglob - potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` - $nocaseglob - else - potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` - fi + potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do # Follow soft links. if ls -lLd "$potent_lib" 2>/dev/null | @@ -7812,13 +6671,13 @@ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` case $potliblink in [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" + newdeplibs="$newdeplibs $a_deplib" a_deplib="" break 2 fi @@ -7827,12 +6686,12 @@ fi if test -n "$a_deplib" ; then droppeddeps=yes - echo + $ECHO $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have" + $ECHO "*** because I did check the linker path looking for a file starting" if test -z "$potlib" ; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else @@ -7843,7 +6702,7 @@ ;; *) # Add a -L argument. - func_append newdeplibs " $a_deplib" + newdeplibs="$newdeplibs $a_deplib" ;; esac done # Gone through all deplibs. @@ -7859,7 +6718,7 @@ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) - func_append newdeplibs " $a_deplib" + newdeplibs="$newdeplibs $a_deplib" a_deplib="" ;; esac @@ -7870,9 +6729,9 @@ potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do potlib="$potent_lib" # see symlink-check above in file_magic test - if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ + if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" + newdeplibs="$newdeplibs $a_deplib" a_deplib="" break 2 fi @@ -7881,12 +6740,12 @@ fi if test -n "$a_deplib" ; then droppeddeps=yes - echo + $ECHO $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have" + $ECHO "*** because I did check the linker path looking for a file starting" if test -z "$potlib" ; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else @@ -7897,32 +6756,32 @@ ;; *) # Add a -L argument. - func_append newdeplibs " $a_deplib" + newdeplibs="$newdeplibs $a_deplib" ;; esac done # Gone through all deplibs. ;; none | unknown | *) newdeplibs="" - tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` + tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ + -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then for i in $predeps $postdeps ; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` + tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` done fi - case $tmp_deplibs in - *[!\ \ ]*) - echo + if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | + $GREP . >/dev/null; then + $ECHO if test "X$deplibs_check_method" = "Xnone"; then - echo "*** Warning: inter-library dependencies are not supported in this platform." + $ECHO "*** Warning: inter-library dependencies are not supported in this platform." else - echo "*** Warning: inter-library dependencies are not known to be supported." + $ECHO "*** Warning: inter-library dependencies are not known to be supported." fi - echo "*** All declared inter-library dependencies are being dropped." + $ECHO "*** All declared inter-library dependencies are being dropped." droppeddeps=yes - ;; - esac + fi ;; esac versuffix=$versuffix_save @@ -7934,23 +6793,23 @@ case $host in *-*-rhapsody* | *-*-darwin1.[012]) # On Rhapsody replace the C library with the System framework - newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` + newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` ;; esac if test "$droppeddeps" = yes; then if test "$module" = yes; then - echo - echo "*** Warning: libtool could not satisfy all declared inter-library" + $ECHO + $ECHO "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" - echo "*** a static module, that should work as long as the dlopening" - echo "*** application is linked with the -dlopen flag." + $ECHO "*** a static module, that should work as long as the dlopening" + $ECHO "*** application is linked with the -dlopen flag." if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + $ECHO + $ECHO "*** However, this would only work if libtool was able to extract symbol" + $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" + $ECHO "*** not find such a program. So, this module is probably useless." + $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then oldlibs="$output_objdir/$libname.$libext" @@ -7960,16 +6819,16 @@ build_libtool_libs=no fi else - echo "*** The inter-library dependencies that have been dropped here will be" - echo "*** automatically added whenever a program is linked with this library" - echo "*** or is declared to -dlopen it." + $ECHO "*** The inter-library dependencies that have been dropped here will be" + $ECHO "*** automatically added whenever a program is linked with this library" + $ECHO "*** or is declared to -dlopen it." if test "$allow_undefined" = no; then - echo - echo "*** Since this library must not contain undefined symbols," - echo "*** because either the platform does not support them or" - echo "*** it was explicitly requested with -no-undefined," - echo "*** libtool will only create a static version of it." + $ECHO + $ECHO "*** Since this library must not contain undefined symbols," + $ECHO "*** because either the platform does not support them or" + $ECHO "*** it was explicitly requested with -no-undefined," + $ECHO "*** libtool will only create a static version of it." if test "$build_old_libs" = no; then oldlibs="$output_objdir/$libname.$libext" build_libtool_libs=module @@ -7986,9 +6845,9 @@ # Time to change all our "foo.ltframework" stuff back to "-framework foo" case $host in *-*-darwin*) - newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac @@ -8001,7 +6860,7 @@ *) case " $deplibs " in *" -L$path/$objdir "*) - func_append new_libs " -L$path/$objdir" ;; + new_libs="$new_libs -L$path/$objdir" ;; esac ;; esac @@ -8011,10 +6870,10 @@ -L*) case " $new_libs " in *" $deplib "*) ;; - *) func_append new_libs " $deplib" ;; + *) new_libs="$new_libs $deplib" ;; esac ;; - *) func_append new_libs " $deplib" ;; + *) new_libs="$new_libs $deplib" ;; esac done deplibs="$new_libs" @@ -8031,12 +6890,10 @@ hardcode_libdirs= dep_rpath= rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + test "$mode" != relink && rpath="$compile_rpath$rpath" for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then - func_replace_sysroot "$libdir" - libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then hardcode_libdirs="$libdir" else @@ -8045,18 +6902,18 @@ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - func_append dep_rpath " $flag" + dep_rpath="$dep_rpath $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_apped perm_rpath " $libdir" ;; + *) perm_rpath="$perm_rpath $libdir" ;; esac fi done @@ -8074,7 +6931,7 @@ # We should set the runpath_var. rpath= for dir in $perm_rpath; do - func_append rpath "$dir:" + rpath="$rpath$dir:" done eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" fi @@ -8082,7 +6939,7 @@ fi shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -8108,18 +6965,18 @@ linknames= for link do - func_append linknames " $link" + linknames="$linknames $link" done # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` + test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` test "X$libobjs" = "X " && libobjs= delfiles= if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" export_symbols="$output_objdir/$libname.uexp" - func_append delfiles " $export_symbols" + delfiles="$delfiles $export_symbols" fi orig_export_symbols= @@ -8150,45 +7007,13 @@ $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds save_ifs="$IFS"; IFS='~' - for cmd1 in $cmds; do + for cmd in $cmds; do IFS="$save_ifs" - # Take the normal branch if the nm_file_list_spec branch - # doesn't work or if tool conversion is not needed. - case $nm_file_list_spec~$to_tool_file_cmd in - *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) - try_normal_branch=yes - eval cmd=\"$cmd1\" - func_len " $cmd" - len=$func_len_result - ;; - *) - try_normal_branch=no - ;; - esac - if test "$try_normal_branch" = yes \ - && { test "$len" -lt "$max_cmd_len" \ - || test "$max_cmd_len" -le -1; } - then - func_show_eval "$cmd" 'exit $?' - skipped_export=false - elif test -n "$nm_file_list_spec"; then - func_basename "$output" - output_la=$func_basename_result - save_libobjs=$libobjs - save_output=$output - output=${output_objdir}/${output_la}.nm - func_to_tool_file "$output" - libobjs=$nm_file_list_spec$func_to_tool_file_result - func_append delfiles " $output" - func_verbose "creating $NM input file list: $output" - for obj in $save_libobjs; do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" - done > "$output" - eval cmd=\"$cmd1\" + eval cmd=\"$cmd\" + func_len " $cmd" + len=$func_len_result + if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then func_show_eval "$cmd" 'exit $?' - output=$save_output - libobjs=$save_libobjs skipped_export=false else # The command line is too long to execute in one step. @@ -8210,7 +7035,7 @@ if test -n "$export_symbols" && test -n "$include_expsyms"; then tmp_export_symbols="$export_symbols" test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' fi if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then @@ -8222,7 +7047,7 @@ # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - func_append delfiles " $export_symbols $output_objdir/$libname.filter" + delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -8232,7 +7057,7 @@ case " $convenience " in *" $test_deplib "*) ;; *) - func_append tmp_deplibs " $test_deplib" + tmp_deplibs="$tmp_deplibs $test_deplib" ;; esac done @@ -8252,21 +7077,21 @@ test "X$libobjs" = "X " && libobjs= else gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" + generated="$generated $gentop" func_extract_archives $gentop $convenience - func_append libobjs " $func_extract_archives_result" + libobjs="$libobjs $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi fi if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" - func_append linker_flags " $flag" + linker_flags="$linker_flags $flag" fi # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then + if test "$mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi @@ -8311,8 +7136,7 @@ save_libobjs=$libobjs fi save_output=$output - func_basename "$output" - output_la=$func_basename_result + output_la=`$ECHO "X$output" | $Xsed -e "$basename"` # Clear the reloadable object creation command queue and # initialize k to one. @@ -8325,16 +7149,13 @@ if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then output=${output_objdir}/${output_la}.lnkscript func_verbose "creating GNU ld script: $output" - echo 'INPUT (' > $output + $ECHO 'INPUT (' > $output for obj in $save_libobjs do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" >> $output + $ECHO "$obj" >> $output done - echo ')' >> $output - func_append delfiles " $output" - func_to_tool_file "$output" - output=$func_to_tool_file_result + $ECHO ')' >> $output + delfiles="$delfiles $output" elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then output=${output_objdir}/${output_la}.lnk func_verbose "creating linker input file list: $output" @@ -8348,12 +7169,10 @@ fi for obj do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" >> $output + $ECHO "$obj" >> $output done - func_append delfiles " $output" - func_to_tool_file "$output" - output=$firstobj\"$file_list_spec$func_to_tool_file_result\" + delfiles="$delfiles $output" + output=$firstobj\"$file_list_spec$output\" else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." @@ -8377,19 +7196,17 @@ # command to the queue. if test "$k" -eq 1 ; then # The first file doesn't have a previous command to add. - reload_objs=$objlist - eval concat_cmds=\"$reload_cmds\" + eval concat_cmds=\"$reload_cmds $objlist $last_robj\" else # All subsequent reloadable object files will link in # the last one created. - reload_objs="$objlist $last_robj" - eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" + eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" fi last_robj=$output_objdir/$output_la-${k}.$objext func_arith $k + 1 k=$func_arith_result output=$output_objdir/$output_la-${k}.$objext - objlist=" $obj" + objlist=$obj func_len " $last_robj" func_arith $len0 + $func_len_result len=$func_arith_result @@ -8399,12 +7216,11 @@ # reloadable object file. All subsequent reloadable object # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" if test -n "$last_robj"; then eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" fi - func_append delfiles " $output" + delfiles="$delfiles $output" else output= @@ -8438,7 +7254,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test "$mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8459,7 +7275,7 @@ if test -n "$export_symbols" && test -n "$include_expsyms"; then tmp_export_symbols="$export_symbols" test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then @@ -8471,7 +7287,7 @@ # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - func_append delfiles " $export_symbols $output_objdir/$libname.filter" + delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -8512,10 +7328,10 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" + generated="$generated $gentop" func_extract_archives $gentop $dlprefiles - func_append libobjs " $func_extract_archives_result" + libobjs="$libobjs $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi @@ -8531,7 +7347,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test "$mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8543,7 +7359,7 @@ IFS="$save_ifs" # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test "$mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -8624,21 +7440,18 @@ if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` else gentop="$output_objdir/${obj}x" - func_append generated " $gentop" + generated="$generated $gentop" func_extract_archives $gentop $convenience reload_conv_objs="$reload_objs $func_extract_archives_result" fi fi - # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test output="$obj" func_execute_cmds "$reload_cmds" 'exit $?' @@ -8698,8 +7511,8 @@ case $host in *-*-rhapsody* | *-*-darwin1.[012]) # On Rhapsody replace the C library is the System framework - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` + compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` ;; esac @@ -8710,14 +7523,14 @@ if test "$tagname" = CXX ; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" + compile_command="$compile_command ${wl}-bind_at_load" + finalize_command="$finalize_command ${wl}-bind_at_load" ;; esac fi # Time to change all our "foo.ltframework" stuff back to "-framework foo" - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac @@ -8731,7 +7544,7 @@ *) case " $compile_deplibs " in *" -L$path/$objdir "*) - func_append new_libs " -L$path/$objdir" ;; + new_libs="$new_libs -L$path/$objdir" ;; esac ;; esac @@ -8741,17 +7554,17 @@ -L*) case " $new_libs " in *" $deplib "*) ;; - *) func_append new_libs " $deplib" ;; + *) new_libs="$new_libs $deplib" ;; esac ;; - *) func_append new_libs " $deplib" ;; + *) new_libs="$new_libs $deplib" ;; esac done compile_deplibs="$new_libs" - func_append compile_command " $compile_deplibs" - func_append finalize_command " $finalize_deplibs" + compile_command="$compile_command $compile_deplibs" + finalize_command="$finalize_command $finalize_deplibs" if test -n "$rpath$xrpath"; then # If the user specified any rpath flags, then add them. @@ -8759,7 +7572,7 @@ # This is the magic to use -rpath. case "$finalize_rpath " in *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; + *) finalize_rpath="$finalize_rpath $libdir" ;; esac done fi @@ -8778,18 +7591,18 @@ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - func_append rpath " $flag" + rpath="$rpath $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; + *) perm_rpath="$perm_rpath $libdir" ;; esac fi case $host in @@ -8798,12 +7611,12 @@ case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; - *) func_append dllsearchpath ":$libdir";; + *) dllsearchpath="$dllsearchpath:$libdir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; ::) dllsearchpath=$testbindir;; - *) func_append dllsearchpath ":$testbindir";; + *) dllsearchpath="$dllsearchpath:$testbindir";; esac ;; esac @@ -8829,18 +7642,18 @@ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - func_append rpath " $flag" + rpath="$rpath $flag" fi elif test -n "$runpath_var"; then case "$finalize_perm_rpath " in *" $libdir "*) ;; - *) func_append finalize_perm_rpath " $libdir" ;; + *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; esac fi done @@ -8854,8 +7667,8 @@ if test -n "$libobjs" && test "$build_old_libs" = yes; then # Transform all the library objects into standard objects. - compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` - finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` + compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` fi func_generate_dlsyms "$outputname" "@PROGRAM@" "no" @@ -8867,15 +7680,15 @@ wrappers_required=yes case $host in - *cegcc* | *mingw32ce*) - # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no - ;; *cygwin* | *mingw* ) if test "$build_libtool_libs" != yes; then wrappers_required=no fi ;; + *cegcc) + # Disable wrappers for cegcc, we are cross compiling anyway. + wrappers_required=no + ;; *) if test "$need_relink" = no || test "$build_libtool_libs" != yes; then wrappers_required=no @@ -8884,19 +7697,13 @@ esac if test "$wrappers_required" = no; then # Replace the output file specification. - compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` + compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` link_command="$compile_command$compile_rpath" # We have no uninstalled library dependencies, so finalize right now. exit_status=0 func_show_eval "$link_command" 'exit_status=$?' - if test -n "$postlink_cmds"; then - func_to_tool_file "$output" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - # Delete the generated files. if test -f "$output_objdir/${outputname}S.${objext}"; then func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' @@ -8919,7 +7726,7 @@ # We should set the runpath_var. rpath= for dir in $perm_rpath; do - func_append rpath "$dir:" + rpath="$rpath$dir:" done compile_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -8927,7 +7734,7 @@ # We should set the runpath_var. rpath= for dir in $finalize_perm_rpath; do - func_append rpath "$dir:" + rpath="$rpath$dir:" done finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -8937,18 +7744,11 @@ # We don't need to create a wrapper script. link_command="$compile_var$compile_command$compile_rpath" # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` + link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. $opt_dry_run || $RM $output # Link the executable and exit func_show_eval "$link_command" 'exit $?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - exit $EXIT_SUCCESS fi @@ -8963,7 +7763,7 @@ if test "$fast_install" != no; then link_command="$finalize_var$compile_command$finalize_rpath" if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` else # fast_install is set to needless relink_command= @@ -8975,19 +7775,13 @@ fi # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` # Delete the old output files. $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname func_show_eval "$link_command" 'exit $?' - if test -n "$postlink_cmds"; then - func_to_tool_file "$output_objdir/$outputname" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - # Now create the wrapper script. func_verbose "creating $output" @@ -9005,7 +7799,18 @@ fi done relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` + fi + + # Quote $ECHO for shipping. + if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then + case $progpath in + [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; + *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; + esac + qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"` + else + qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"` fi # Only actually do things if not in dry run mode. @@ -9085,7 +7890,7 @@ else oldobjs="$old_deplibs $non_pic_objects" if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" + oldobjs="$oldobjs $symfileobj" fi fi addlibs="$old_convenience" @@ -9093,10 +7898,10 @@ if test -n "$addlibs"; then gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" + generated="$generated $gentop" func_extract_archives $gentop $addlibs - func_append oldobjs " $func_extract_archives_result" + oldobjs="$oldobjs $func_extract_archives_result" fi # Do each command in the archive commands. @@ -9107,10 +7912,10 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" + generated="$generated $gentop" func_extract_archives $gentop $dlprefiles - func_append oldobjs " $func_extract_archives_result" + oldobjs="$oldobjs $func_extract_archives_result" fi # POSIX demands no paths to be encoded in archives. We have @@ -9126,9 +7931,9 @@ done | sort | sort -uc >/dev/null 2>&1); then : else - echo "copying selected object files to avoid basename conflicts..." + $ECHO "copying selected object files to avoid basename conflicts..." gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" + generated="$generated $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs oldobjs= @@ -9152,9 +7957,9 @@ esac done func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - func_append oldobjs " $gentop/$newobj" + oldobjs="$oldobjs $gentop/$newobj" ;; - *) func_append oldobjs " $obj" ;; + *) oldobjs="$oldobjs $obj" ;; esac done fi @@ -9164,16 +7969,6 @@ len=$func_len_result if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then cmds=$old_archive_cmds - elif test -n "$archiver_list_spec"; then - func_verbose "using command file archive linking..." - for obj in $oldobjs - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" - done > $output_objdir/$libname.libcmd - func_to_tool_file "$output_objdir/$libname.libcmd" - oldobjs=" $archiver_list_spec$func_to_tool_file_result" - cmds=$old_archive_cmds else # the command line is too long to link in one step, link in parts func_verbose "using piecewise archive linking..." @@ -9247,7 +8042,7 @@ done # Quote the link command for shipping. relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` if test "$hardcode_automatic" = yes ; then relink_command= fi @@ -9270,19 +8065,9 @@ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" - func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" - ;; - -L*) - func_stripname -L '' "$deplib" - func_replace_sysroot "$func_stripname_result" - func_append newdependency_libs " -L$func_replace_sysroot_result" + newdependency_libs="$newdependency_libs $libdir/$name" ;; - -R*) - func_stripname -R '' "$deplib" - func_replace_sysroot "$func_stripname_result" - func_append newdependency_libs " -R$func_replace_sysroot_result" - ;; - *) func_append newdependency_libs " $deplib" ;; + *) newdependency_libs="$newdependency_libs $deplib" ;; esac done dependency_libs="$newdependency_libs" @@ -9296,9 +8081,9 @@ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" + newdlfiles="$newdlfiles $libdir/$name" ;; - *) func_append newdlfiles " $lib" ;; + *) newdlfiles="$newdlfiles $lib" ;; esac done dlfiles="$newdlfiles" @@ -9315,7 +8100,7 @@ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" + newdlprefiles="$newdlprefiles $libdir/$name" ;; esac done @@ -9327,7 +8112,7 @@ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - func_append newdlfiles " $abs" + newdlfiles="$newdlfiles $abs" done dlfiles="$newdlfiles" newdlprefiles= @@ -9336,33 +8121,15 @@ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - func_append newdlprefiles " $abs" + newdlprefiles="$newdlprefiles $abs" done dlprefiles="$newdlprefiles" fi $RM $output # place dlname in correct position for cygwin - # In fact, it would be nice if we could use this code for all target - # systems that can't hard-code library paths into their executables - # and that have no shared library path variable independent of PATH, - # but it turns out we can't easily determine that from inspecting - # libtool variables, so we have to hard-code the OSs to which it - # applies here; at the moment, that means platforms that use the PE - # object format with DLL files. See the long comment at the top of - # tests/bindir.at for full details. tdlname=$dlname case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) - # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then - func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname - else - # Otherwise fall back on heuristic. - tdlname=../bin/$dlname - fi - ;; + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; esac $ECHO > $output "\ # $outputname - a libtool library file @@ -9421,7 +8188,7 @@ exit $EXIT_SUCCESS } -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && +{ test "$mode" = link || test "$mode" = relink; } && func_mode_link ${1+"$@"} @@ -9441,9 +8208,9 @@ for arg do case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; - -*) func_append RM " $arg" ;; - *) func_append files " $arg" ;; + -f) RM="$RM $arg"; rmforce=yes ;; + -*) RM="$RM $arg" ;; + *) files="$files $arg" ;; esac done @@ -9452,23 +8219,24 @@ rmdirs= + origobjdir="$objdir" for file in $files; do func_dirname "$file" "" "." dir="$func_dirname_result" if test "X$dir" = X.; then - odir="$objdir" + objdir="$origobjdir" else - odir="$dir/$objdir" + objdir="$dir/$origobjdir" fi func_basename "$file" name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" + test "$mode" = uninstall && objdir="$dir" - # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then + # Remember objdir for removal later, being careful to avoid duplicates + if test "$mode" = clean; then case " $rmdirs " in - *" $odir "*) ;; - *) func_append rmdirs " $odir" ;; + *" $objdir "*) ;; + *) rmdirs="$rmdirs $objdir" ;; esac fi @@ -9494,17 +8262,18 @@ # Delete the libtool libraries and symlinks. for n in $library_names; do - func_append rmfiles " $odir/$n" + rmfiles="$rmfiles $objdir/$n" done - test -n "$old_library" && func_append rmfiles " $odir/$old_library" + test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" - case "$opt_mode" in + case "$mode" in clean) - case " $library_names " in + case " $library_names " in + # " " in the beginning catches empty $dlname *" $dlname "*) ;; - *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; + *) rmfiles="$rmfiles $objdir/$dlname" ;; esac - test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" + test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ;; uninstall) if test -n "$library_names"; then @@ -9532,19 +8301,19 @@ # Add PIC object to the list of files to remove. if test -n "$pic_object" && test "$pic_object" != none; then - func_append rmfiles " $dir/$pic_object" + rmfiles="$rmfiles $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. if test -n "$non_pic_object" && test "$non_pic_object" != none; then - func_append rmfiles " $dir/$non_pic_object" + rmfiles="$rmfiles $dir/$non_pic_object" fi fi ;; *) - if test "$opt_mode" = clean ; then + if test "$mode" = clean ; then noexename=$name case $file in *.exe) @@ -9554,7 +8323,7 @@ noexename=$func_stripname_result # $file with .exe has already been added to rmfiles, # add $file without .exe - func_append rmfiles " $file" + rmfiles="$rmfiles $file" ;; esac # Do a test to see if this is a libtool program. @@ -9563,7 +8332,7 @@ func_ltwrapper_scriptname "$file" relink_command= func_source $func_ltwrapper_scriptname_result - func_append rmfiles " $func_ltwrapper_scriptname_result" + rmfiles="$rmfiles $func_ltwrapper_scriptname_result" else relink_command= func_source $dir/$noexename @@ -9571,12 +8340,12 @@ # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" + rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" if test "$fast_install" = yes && test -n "$relink_command"; then - func_append rmfiles " $odir/lt-$name" + rmfiles="$rmfiles $objdir/lt-$name" fi if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" + rmfiles="$rmfiles $objdir/lt-${noexename}.c" fi fi fi @@ -9584,6 +8353,7 @@ esac func_show_eval "$RM $rmfiles" 'exit_status=1' done + objdir="$origobjdir" # Try to remove the ${objdir}s in the directories where we deleted files for dir in $rmdirs; do @@ -9595,16 +8365,16 @@ exit $exit_status } -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && +{ test "$mode" = uninstall || test "$mode" = clean; } && func_mode_uninstall ${1+"$@"} -test -z "$opt_mode" && { +test -z "$mode" && { help="$generic_help" func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode \`$mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" diff -Nru lxsession-edit-0.2.0/lxsession-edit.desktop.in lxsession-edit-0.2.0~svn20090913/lxsession-edit.desktop.in --- lxsession-edit-0.2.0/lxsession-edit.desktop.in 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/lxsession-edit.desktop.in 2009-09-05 21:29:07.000000000 +0000 @@ -2,7 +2,15 @@ Type=Application Icon=xfwm4 Exec=lxsession-edit -_Name=Desktop Session Settings -_Comment=Manage applications loaded in desktop session +Name=Desktop Session Settings +Name[de]=Sitzungseigenschaften +Name[fi]=Työpöytäistunnon asetukset +Name[ja]=デスクトップセッションの設定 +Name[zh_TW]=桌面工作階段設定 +Comment=Manage applications loaded in desktop session +Comment[de]=Automatisch gestartete Anwendungen verwalten +Comment[fi]=Hallitse automaattisesti käynnistettäviä sovelluksia +Comment[ja]=デスクトップセッションでロードされるアプリケーションを管理します +Comment[zh_TW]=管理桌面工作階段中載入的程式 Categories=Settings;DesktopSettings;X-LXDE-Settings; NotShowIn=GNOME;KDE;XFCE; diff -Nru lxsession-edit-0.2.0/missing lxsession-edit-0.2.0~svn20090913/missing --- lxsession-edit-0.2.0/missing 2011-07-19 20:18:17.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/missing 2009-09-13 11:06:51.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 +# Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -18,7 +18,9 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# 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 @@ -87,9 +89,6 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. - Send bug reports to ." exit $? ;; @@ -107,22 +106,15 @@ esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. +# the program). case $1 in - lex*|yacc*) + lex|yacc) # Not GNU programs, they don't have --version. ;; - tar*) + tar) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -146,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $program in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -156,7 +148,7 @@ touch aclocal.m4 ;; - autoconf*) + autoconf) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -165,7 +157,7 @@ touch configure ;; - autoheader*) + autoheader) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -195,7 +187,7 @@ while read f; do touch "$f"; done ;; - autom4te*) + autom4te) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -218,7 +210,7 @@ fi ;; - bison*|yacc*) + bison|yacc) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -248,7 +240,7 @@ fi ;; - lex*|flex*) + lex|flex) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -271,7 +263,7 @@ fi ;; - help2man*) + help2man) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -285,11 +277,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit $? + exit 1 fi ;; - makeinfo*) + makeinfo) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -318,7 +310,7 @@ touch $file ;; - tar*) + tar) shift # We have already tried tar in the generic part. @@ -371,6 +363,5 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" +# time-stamp-end: "$" # End: diff -Nru lxsession-edit-0.2.0/po/LINGUAS lxsession-edit-0.2.0~svn20090913/po/LINGUAS --- lxsession-edit-0.2.0/po/LINGUAS 2011-07-19 20:18:23.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/LINGUAS 2009-09-13 10:23:46.000000000 +0000 @@ -1,57 +1,40 @@ +# Please keep it in alphabetical order af ar -ast -be bg -bn bn_IN -ca cs da de -el -en_GB es -es_VE et eu fa fi -fo fr -frp gl -he hr hu id it ja ko -lg lt ml ms nb nl nn -pa pl ps -pt pt_BR -ro +pt ru -si sk sl sr -sr@latin sv -te -th tr -tt_RU uk ur ur_PK diff -Nru lxsession-edit-0.2.0/po/Makefile.in.in lxsession-edit-0.2.0~svn20090913/po/Makefile.in.in --- lxsession-edit-0.2.0/po/Makefile.in.in 2011-07-19 20:18:16.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/Makefile.in.in 2009-09-13 11:06:51.000000000 +0000 @@ -56,7 +56,7 @@ PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi) +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi) USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) @@ -129,7 +129,7 @@ done # Empty stubs to satisfy archaic automake needs -dvi info ctags tags CTAGS TAGS ID: +dvi info tags TAGS ID: # Define this as empty until I found a useful application. install-exec installcheck: diff -Nru lxsession-edit-0.2.0/po/POTFILES.in lxsession-edit-0.2.0~svn20090913/po/POTFILES.in --- lxsession-edit-0.2.0/po/POTFILES.in 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/POTFILES.in 2009-09-05 21:29:07.000000000 +0000 @@ -1,4 +1,4 @@ src/lxsession-edit.c -[type: gettext/glade]data/lxsession-edit.ui +data/lxsession-edit.glade lxsession-edit.desktop.in diff -Nru lxsession-edit-0.2.0/po/af.po lxsession-edit-0.2.0~svn20090913/po/af.po --- lxsession-edit-0.2.0/po/af.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/af.po 2009-09-05 21:29:07.000000000 +0000 @@ -7,30 +7,28 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2010-09-01 23:38+0200\n" -"Last-Translator: F \n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" +"PO-Revision-Date: 2009-05-18 22:00+0200\n" +"Last-Translator: F Wolff \n" "Language-Team: LANGUAGE \n" -"Language: af\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" +"X-Generator: Pootle 1.1.0\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "Gekativeer" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "Toepassing" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "Kommentaar" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" @@ -43,19 +41,19 @@ "LET WEL: Hierdie instelling sal van krag wees by die volgende " "aanmelding." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "Gevorderde keuses" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "Toepassings wat outomaties begin word met ingaan van die werkskerm:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "Toepassings wat outomaties begin word" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" @@ -64,15 +62,10 @@ "(Die verstekopdrag vir LXDE se vensterbestuurder behoort 'openbox-lxde' te " "wees)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "Sessie-instellings vir die werkskerm" -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "Vensterbestuurder: " - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Bestuur toepassings wat in die werkskermsessie gelaai word" diff -Nru lxsession-edit-0.2.0/po/ar.po lxsession-edit-0.2.0~svn20090913/po/ar.po --- lxsession-edit-0.2.0/po/ar.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/ar.po 2009-09-05 21:29:07.000000000 +0000 @@ -2,34 +2,32 @@ # Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # أحمد فرغل , 2009. -# Tareq Al Jurf , 2010. # msgid "" msgstr "" "Project-Id-Version: LXSession-edit\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2010-04-20 19:45+0300\n" -"Last-Translator: Tareq Al Jurf \n" -"Language-Team: Arabic \n" -"Language: ar\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" +"PO-Revision-Date: 2009-01-26 20:30+0200\n" +"Last-Translator: Ahmad Farghal \n" +"Language-Team: Arabic\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "مُمَكّن" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "التطبيق" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "التعليق" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" @@ -40,19 +38,19 @@ "\n" "ملحوظة: ينفذ هذا التعيين عند الولوج التالي." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "خيارات متقدمة" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "التطبيقات التي تُفتَح آليا عند الولوج لسطح المكتب:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "التطبيقات التي تُفتَح آليا" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" @@ -60,15 +58,10 @@ "سطر الأوامر المستخدم لتشغيل مدير النوافد\n" "(أمر مدير النوافذ المبدئي لـLXDE هو openbox-lxde)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "إعدادات جلسة سطح المكتب" -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "مدير النوافذ:" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "أدِر التطبيقات المحملة في جلسة سطح المكتب" diff -Nru lxsession-edit-0.2.0/po/ast.po lxsession-edit-0.2.0~svn20090913/po/ast.po --- lxsession-edit-0.2.0/po/ast.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/ast.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -# Asturian translation of lxsession-edit -# Copyright (C) 2008 THE lxsession-edit'S COPYRIGHT HOLDER -# This file is distributed under the same license as the lxsession-edit package. -# -# Iñigo Varela , 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: lxsession-edit\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2010-05-09 17:11+0100\n" -"Last-Translator: astur \n" -"Language-Team: Asturian \n" -"Language: ast\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.1\n" -"X-Poedit-Language: Asturian\n" - -#: ../src/lxsession-edit.c:362 -msgid "Enabled" -msgstr "Activáu" - -#: ../src/lxsession-edit.c:367 -msgid "Application" -msgstr "Aplicación" - -#: ../src/lxsession-edit.c:375 -msgid "Comment" -msgstr "Comentariu" - -#: ../data/lxsession-edit.ui.h:1 -msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" -"\n" -"NOTE: This setting will take effect on next login." -msgstr "" -"Alvertencia: NUN modifiques esto, sacantes que sepas " -"esautamente lo que faes.\n" -"\n" -"NOTA: Esti axuste fadrá efeutu nel siguiente aniciu de sesión." - -#: ../data/lxsession-edit.ui.h:4 -msgid "Advanced Options" -msgstr "Opciones avanzaes" - -#: ../data/lxsession-edit.ui.h:5 -msgid "Applications automatically started after entering desktop:" -msgstr "Aplicaciones aniciaes automáticamente tres d'entrar al escritoriu:" - -#: ../data/lxsession-edit.ui.h:6 -msgid "Automatically Started Applications" -msgstr "Aniciar automáticamente les aplicaciones" - -#: ../data/lxsession-edit.ui.h:7 -msgid "" -"Command line used to launch window manager\n" -"(The default window manager command for LXDE should be openbox-lxde)" -msgstr "" -"La llinia de comandos usada pa llanzar el xestor de ventanes\n" -"(El programa de llinia de comandos de LXDE por omisión tendría de ser " -"openbox-lxde)" - -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 -msgid "Desktop Session Settings" -msgstr "Configuración de la sesión d'escritoriu" - -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" -msgstr "Xestor de ventanes: " - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Xestiona les aplicaciones cargaes na sesión d'escritoriu" diff -Nru lxsession-edit-0.2.0/po/be.po lxsession-edit-0.2.0~svn20090913/po/be.po --- lxsession-edit-0.2.0/po/be.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/be.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2010-08-25 13:35+0200\n" -"Last-Translator: Анік \n" -"Language-Team: LANGUAGE \n" -"Language: be\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 2.0.5\n" - -#: ../src/lxsession-edit.c:362 -msgid "Enabled" -msgstr "Уключана" - -#: ../src/lxsession-edit.c:367 -msgid "Application" -msgstr "Праграма" - -#: ../src/lxsession-edit.c:375 -msgid "Comment" -msgstr "Каментар" - -#: ../data/lxsession-edit.ui.h:1 -msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" -"\n" -"NOTE: This setting will take effect on next login." -msgstr "" -"Увага: Не змяняйце гэта, калі Вы дакладна не ведаеце, што Вы " -"робіце.\n" -"\n" -"Заўвага: Гэтыя налады набудуць моц пры настым уваходзе сістэму." - -#: ../data/lxsession-edit.ui.h:4 -msgid "Advanced Options" -msgstr "Дадатковыя опцыі" - -#: ../data/lxsession-edit.ui.h:5 -msgid "Applications automatically started after entering desktop:" -msgstr "Праграмы, якія аўтаматычна запускаюцца пасля ўваходу" - -#: ../data/lxsession-edit.ui.h:6 -msgid "Automatically Started Applications" -msgstr "Праграмы, якія аўтаматычна запускаюцца" - -#: ../data/lxsession-edit.ui.h:7 -msgid "" -"Command line used to launch window manager\n" -"(The default window manager command for LXDE should be openbox-lxde)" -msgstr "" -"Загадны радок для запуску аконнага мэнэджэра\n" -"(Па змоўчаньні аконным мэнэджэрам LXDE павінен быць openbox-lxde)" - -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 -msgid "Desktop Session Settings" -msgstr "Налады сесіі працоўнага стала" - -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" -msgstr "Аконны мэнэджар:" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Кіраванне праграмамі, якія загружаюцца ў настольнай сесіі." diff -Nru lxsession-edit-0.2.0/po/bg.po lxsession-edit-0.2.0~svn20090913/po/bg.po --- lxsession-edit-0.2.0/po/bg.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/bg.po 2009-09-13 10:23:46.000000000 +0000 @@ -3,74 +3,61 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: lxsession\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2011-06-20 15:16+0200\n" -"Last-Translator: Радослав \n" -"Language-Team: MIME-Version: 1.0\n" -"Language: bg\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" -"X-Poedit-Language: Bulgarian\n" -"X-Poedit-Country: BULGARIA\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" -msgstr "Разрешен" +msgstr "" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" -msgstr "Програма" +msgstr "" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" -msgstr "Коментар" +msgstr "" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" "\n" "NOTE: This setting will take effect on next login." msgstr "" -"Внимание: НЕ променяйте, ако не знаете какво правите.\n" -"\n" -"Забележка: Тези настройки ще влезат в сила при следващото вписване." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" -msgstr "Допълнителни опции" +msgstr "" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" -msgstr "Автоматично стартирани програми след зареждане на работния плот:" +msgstr "" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" -msgstr "Автоматично стартирани програми" +msgstr "" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" msgstr "" -"Команда, използвана за стартиране на мениджъра на прозорците\n" -"(Командата по подразбиране в LXDE е: openbox-lxde)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" -msgstr "Настройки на десктоп сесията" +msgstr "" -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" -msgstr "Мениджър на позорци:" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Управление на приложенията, заредени за сесията" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " +msgstr "" diff -Nru lxsession-edit-0.2.0/po/bn.po lxsession-edit-0.2.0~svn20090913/po/bn.po --- lxsession-edit-0.2.0/po/bn.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/bn.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Sankarshan , 2009. -# Sadia Afroz , 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: bn\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2010-01-31 17:44+0600\n" -"Last-Translator: Sadia Afroz \n" -"Language-Team: Bengali \n" -"Language: bn\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Pootle 1.1.0\n" - -#: ../src/lxsession-edit.c:362 -msgid "Enabled" -msgstr "সক্রিয়" - -#: ../src/lxsession-edit.c:367 -msgid "Application" -msgstr "অ্যাপ্লিকেশন" - -#: ../src/lxsession-edit.c:375 -msgid "Comment" -msgstr "সমালোচনা" - -#: ../data/lxsession-edit.ui.h:1 -msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" -"\n" -"NOTE: This setting will take effect on next login." -msgstr "" -"সতর্কীকরণ: এটা ধরবেন না যদি আপনি নিশ্চিতভাবে না জানেন যে আপনি কি " -"করছেন।\n" -"\n" -"টীকা: এই সেটিংসমূহ পরবর্তী লগ ইনে কার্যকর হবে।" - -#: ../data/lxsession-edit.ui.h:4 -msgid "Advanced Options" -msgstr "উন্নত অপশন" - -#: ../data/lxsession-edit.ui.h:5 -msgid "Applications automatically started after entering desktop:" -msgstr "ডেস্কটপ চালু করার পর যে অ্যাপ্লিকেশনগুলো স্বয়ংক্রিয়ভাবে আরম্ভ হবে:" - -#: ../data/lxsession-edit.ui.h:6 -msgid "Automatically Started Applications" -msgstr "স্বয়ংক্রিয়ভাবে চালু হওয়া অ্যাপ্লিকেশন" - -#: ../data/lxsession-edit.ui.h:7 -msgid "" -"Command line used to launch window manager\n" -"(The default window manager command for LXDE should be openbox-lxde)" -msgstr "" -"উইন্ডো ম্যানেজার চালু করার জন্য ব্যবহৃত কমান্ড লাইন\n" -"(LXDE-র জন্য পূর্বনির্ধারিত উইন্ডো ম্যানেজার কম্যান্ড হল openbox-lxde)" - -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 -msgid "Desktop Session Settings" -msgstr "ডেস্কটপ সেশনের সেটিংসমূহ" - -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" -msgstr "উইন্ডো ম্যানেজার:" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "ডেস্কটপ সেশনে লোডকৃত অ্যাপ্লিকেশনগুলো পরিচালনা করে" diff -Nru lxsession-edit-0.2.0/po/bn_IN.po lxsession-edit-0.2.0~svn20090913/po/bn_IN.po --- lxsession-edit-0.2.0/po/bn_IN.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/bn_IN.po 2009-09-13 10:23:46.000000000 +0000 @@ -7,30 +7,28 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" "PO-Revision-Date: 2009-07-28 11:54+0200\n" "Last-Translator: Sankarshan \n" "Language-Team: LANGUAGE \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" +"X-Generator: Pootle 1.1.0\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "সক্রিয়" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "অ্যাপ্লিকেশন" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "বিবৃতি" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" @@ -38,19 +36,19 @@ "NOTE: This setting will take effect on next login." msgstr "" -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "উন্নত বিকল্প" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "ডেস্কটপ চালু করার পর যে অ্যাপ্লিকেশনগুলি সয়ংক্রিয়ভাবে আরম্ভ হবে:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "সয়ংক্রিয়ভাবে যে অ্যাপ্লিকেশন চালু হয়েছে" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" @@ -58,15 +56,10 @@ "উইন্ডো ম্যানেজার লঞ্চ করার জন্য ব্যবহৃত কম্যান্ড লাইন\n" "(openbox-lxde হল LXDE-এর ডিফল্ট উইন্ডো ম্যানেজার কম্যান্ড )" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "ডেস্কটপ সেশানের বিবিধ বৈশিষ্ট্য" -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "উইন্ডো ম্যানেজার:" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "ডেস্কটপ সেশনে লোড হওয়া অ্যাপ্লেটগুলি পরিচালনা করুন" diff -Nru lxsession-edit-0.2.0/po/ca.po lxsession-edit-0.2.0~svn20090913/po/ca.po --- lxsession-edit-0.2.0/po/ca.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/ca.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -# lxsession-edit.po CATALAN TRANSLATION -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2010-01-13 23:09+0200\n" -"Last-Translator: Josep Sanchez \n" -"Language-Team: LXDE Catalan translators group\n" -"Language: ca\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.0\n" - -#: ../src/lxsession-edit.c:362 -msgid "Enabled" -msgstr "Habilitat" - -#: ../src/lxsession-edit.c:367 -msgid "Application" -msgstr "Aplicació" - -#: ../src/lxsession-edit.c:375 -msgid "Comment" -msgstr "Comentari" - -#: ../data/lxsession-edit.ui.h:1 -msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" -"\n" -"NOTE: This setting will take effect on next login." -msgstr "" -"Avís: NO toqueu això a no ser que sapigueu exactament el que " -"esteu fent.\n" -"\n" -"NOTA: aquest paràmetre tindrà efecte a la propera entrada al sistema." - -#: ../data/lxsession-edit.ui.h:4 -msgid "Advanced Options" -msgstr "Opcions avançades" - -#: ../data/lxsession-edit.ui.h:5 -msgid "Applications automatically started after entering desktop:" -msgstr "" -"Aplicacions que s'engegaran automàticament un cop hagueu entrat a " -"l'escriptori:" - -#: ../data/lxsession-edit.ui.h:6 -msgid "Automatically Started Applications" -msgstr "Aplicacions engegades automàticament" - -#: ../data/lxsession-edit.ui.h:7 -msgid "" -"Command line used to launch window manager\n" -"(The default window manager command for LXDE should be openbox-lxde)" -msgstr "" -"Intérpret d'ordres emprat per a invocar el gestor de finestres\n" -"(L'ordre predeterminada per a LXDE hauria de ser openbox-lxde)" - -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 -msgid "Desktop Session Settings" -msgstr "Paràmetres de la sessió d'escriptori" - -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" -msgstr "Gestor de finestres" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Gestioneu els programes que es carreguen a la sessió d'escriptori" diff -Nru lxsession-edit-0.2.0/po/cs.po lxsession-edit-0.2.0~svn20090913/po/cs.po --- lxsession-edit-0.2.0/po/cs.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/cs.po 2009-09-05 21:29:07.000000000 +0000 @@ -7,30 +7,28 @@ msgstr "" "Project-Id-Version: lxsession-edit 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2010-03-29 22:53+0200\n" -"Last-Translator: \n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" +"PO-Revision-Date: 2009-02-02 01:56+0100\n" +"Last-Translator: Michal Várady \n" "Language-Team: Czech\n" -"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Pootle 2.0.1\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "Povoleno" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "Aplikace" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "Poznámka" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" @@ -42,19 +40,19 @@ "\n" "POZNÁMKA: Toto nastavení se projeví při vašem dalším přihlášení." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "Pokročilé volby" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "Automaticky spouštěné aplikace při vstupu do pracovního prostředí:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "Automaticky spouštěné aplikace" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" @@ -63,15 +61,10 @@ "(Výchozí příkaz pro spuštění správce oken prostředí LXDE by měl být openbox-" "lxde)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "Nastavení relace pracovního prostředí" -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "Správce oken:" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Spravuje aplikace spuštěné v relaci pracovní plochy" diff -Nru lxsession-edit-0.2.0/po/da.po lxsession-edit-0.2.0~svn20090913/po/da.po --- lxsession-edit-0.2.0/po/da.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/da.po 2009-09-05 21:29:07.000000000 +0000 @@ -1,38 +1,35 @@ -# Danish translation lxde.lxsession-edit. -# Copyright (C) 2010 lxde.lxsession-edit & Joe Hansen. -# This file is distributed under the same license as the lxde.lxsession-edit package -# charlie tyrrestrup -# Joe Hansen , 2010. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # msgid "" msgstr "" "Project-Id-Version: lxsession-edit\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2011-06-27 16:12+0200\n" -"Last-Translator: Kristian \n" -"Language-Team: Danish \n" -"Language: da\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" +"PO-Revision-Date: 2009-03-16 21:06+0100\n" +"Last-Translator: charlie tyrrestrup \n" +"Language-Team: da \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" +"X-Generator: Pootle 1.1.0\n" "X-Poedit-Language: Danish\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "Aktiveret" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "Program" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "Kommentar" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" @@ -41,36 +38,32 @@ msgstr "" "Advarsel: GØR IKKE noget her med mindre du ved nøjagtig hvad du gør.\n" "\n" -"BEMÆRK: Denne indstilling træder i kraft efter næste logind." +"BEMÆRK: Denne indstilling træder i kraft efter næste log ind." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" -msgstr "Avancerede indstillinger" +msgstr "Avancerede Indstillinger" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "Programmer der er startet automatisk efter opstart af skrivebordet:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" -msgstr "Programmer der startes automatisk" +msgstr "Programmer der Startes Automatisk " -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" msgstr "" "Kommando der starter skrivebordsmiljøet\n" -"(Standardskrivebordsmiljøet for LXDE bør være openbox-lxde)" +"(Standard skrivebordsmiljøet for LXDE, bør være openbox-lxde)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" -msgstr "Indstillinger for skrivebordssession" +msgstr "Indstillinger for session" -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "Skrivebordsmiljø:" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Håndter programmer indlæst i skrivebordssessionen" diff -Nru lxsession-edit-0.2.0/po/de.po lxsession-edit-0.2.0~svn20090913/po/de.po --- lxsession-edit-0.2.0/po/de.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/de.po 2009-09-05 21:29:07.000000000 +0000 @@ -5,30 +5,29 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" "PO-Revision-Date: 2009-01-25 16:41+0100\n" "Last-Translator: Mario Blättermann \n" "Language-Team: German \n" -"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: German\n" "X-Poedit-Country: GERMANY\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "Aktiviert" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "Anwendung" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "Beschreibung" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" @@ -40,19 +39,19 @@ "\n" "ACHTUNG: Diese Einstellung wird bei der nächsten Anmeldung wirksam." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "Erweiterte Optionen" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "Nach dem Start der Arbeitsumgebung automatisch gestartete Anwendungen:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "Automatisch gestartete Anwendungen" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" @@ -60,15 +59,10 @@ "Befehl für den Start des Fenstermanagers\n" "(Der vorgegebene Fenstermanagerbefehl für LXDE sollte »openbox-lxde« lauten)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "Desktop-Sitzungseinstellungen" -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "Fenstermanager:" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Automatisch gestartete Anwendungen verwalten" diff -Nru lxsession-edit-0.2.0/po/el.po lxsession-edit-0.2.0~svn20090913/po/el.po --- lxsession-edit-0.2.0/po/el.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/el.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: el\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2011-06-08 11:41+0200\n" -"Last-Translator: George \n" -"Language-Team: Greek\n" -"Language: el\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" -"X-Poedit-Language: Greek\n" -"X-Poedit-Country: GREECE\n" - -#: ../src/lxsession-edit.c:362 -msgid "Enabled" -msgstr "Ενεργοποιημένο" - -#: ../src/lxsession-edit.c:367 -msgid "Application" -msgstr "Εφαρμογή" - -#: ../src/lxsession-edit.c:375 -msgid "Comment" -msgstr "Σχόλιο" - -#: ../data/lxsession-edit.ui.h:1 -msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" -"\n" -"NOTE: This setting will take effect on next login." -msgstr "" -"Προειδοποίηση: ΜΗΝ αγγίζετε αυτό εκτός αν ξέρετε καλά τι " -"κάνετε.\n" -"\n" -"ΣΗΜΕΙΩΣΗ: Αυτή η ρύθμιση θα εφαρμοστεί μετά από επανασύνδεση." - -#: ../data/lxsession-edit.ui.h:4 -msgid "Advanced Options" -msgstr "Προχωρημένες επιλογές" - -#: ../data/lxsession-edit.ui.h:5 -msgid "Applications automatically started after entering desktop:" -msgstr "" -"Εφαρμογές αυτόματα εκτελούμενες μετά την είσοδο στην επιφάνεια εργασίας:" - -#: ../data/lxsession-edit.ui.h:6 -msgid "Automatically Started Applications" -msgstr "Αυτόματα εκτελούμενες εφαρμογές" - -#: ../data/lxsession-edit.ui.h:7 -msgid "" -"Command line used to launch window manager\n" -"(The default window manager command for LXDE should be openbox-lxde)" -msgstr "" -"Εντολή εκκίνησης διαχειριστή παραθύρων\n" -"(Η προκαθορισμένη εντολή για το διαχειριστή του LXDE είναι openbox-lxde)" - -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 -msgid "Desktop Session Settings" -msgstr "Ρυθμίσεις συνεδρίας επιφάνειας εργασίας" - -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" -msgstr "Διαχειριστής παραθύρων:" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Διαχείριση των φορτωμένων εφαρμογών στη συνεδρία" diff -Nru lxsession-edit-0.2.0/po/en_GB.po lxsession-edit-0.2.0~svn20090913/po/en_GB.po --- lxsession-edit-0.2.0/po/en_GB.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/en_GB.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: lxsession-edit\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2011-06-12 15:44+0200\n" -"Last-Translator: Steve \n" -"Language-Team: English UK en_GB \n" -"Language: en_GB\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" -"X-Poedit-Language: English\n" -"X-Poedit-Country: UNITED KINGDOM\n" - -#: ../src/lxsession-edit.c:362 -msgid "Enabled" -msgstr "Enabled" - -#: ../src/lxsession-edit.c:367 -msgid "Application" -msgstr "Application" - -#: ../src/lxsession-edit.c:375 -msgid "Comment" -msgstr "Comment" - -#: ../data/lxsession-edit.ui.h:1 -msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" -"\n" -"NOTE: This setting will take effect on next login." -msgstr "" -"WARNING: Do NOT touch this unless you know exactly what you " -"are doing.\n" -"\n" -"NOTE: This setting will take effect on next login." - -#: ../data/lxsession-edit.ui.h:4 -msgid "Advanced Options" -msgstr "Advanced Options" - -#: ../data/lxsession-edit.ui.h:5 -msgid "Applications automatically started after entering desktop:" -msgstr "Applications automatically started after entering desktop:" - -#: ../data/lxsession-edit.ui.h:6 -msgid "Automatically Started Applications" -msgstr "Automatically Started Applications" - -#: ../data/lxsession-edit.ui.h:7 -msgid "" -"Command line used to launch window manager\n" -"(The default window manager command for LXDE should be openbox-lxde)" -msgstr "" -"Command line used to launch window manager\n" -"(The default window manager command for LXDE should be openbox-lxde)" - -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 -msgid "Desktop Session Settings" -msgstr "Desktop Session Settings" - -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" -msgstr "Window Manager: " - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Manage applications loaded in desktop session" diff -Nru lxsession-edit-0.2.0/po/es.po lxsession-edit-0.2.0~svn20090913/po/es.po --- lxsession-edit-0.2.0/po/es.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/es.po 2009-09-05 21:29:07.000000000 +0000 @@ -8,55 +8,54 @@ msgstr "" "Project-Id-Version: lxsession-edit\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2011-06-21 04:58+0200\n" -"Last-Translator: Hugo \n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" +"PO-Revision-Date: 2009-05-31 16:28+0200\n" +"Last-Translator: Hugo Florentino \n" "Language-Team: Spanish \n" -"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" +"X-Generator: Pootle 1.1.0\n" "X-Poedit-Language: Spanish\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "Activado" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "Aplicación" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "Comentario" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" "\n" "NOTE: This setting will take effect on next login." msgstr "" -"Advertencia: NO modifique esto, a menos que sepa exactamente " -"lo que hace.\n" +"Advertencia: NO edite esto, a menos que sepa exactamente lo " +"que está haciendo.\n" "\n" -"NOTA: Este ajuste surtirá efecto en el próximo inicio de sesión." +"NOTA: Este ajuste surtirá efecto la próxima vez que inicie sesión." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "Opciones avanzadas" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" -msgstr "Aplicaciones iniciadas automáticamente tras entrar al escritorio:" +msgstr "Aplicaciones que automáticamente inician después del escritorio:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" -msgstr "Aplicaciones iniciadas automáticamente" +msgstr "Iniciar automáticamente las aplicaciones" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" @@ -65,14 +64,10 @@ "(El programa de línea de comandos de LXDE por omisión debería ser openbox-" "lxde)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "Configuración de la sesión de escritorio" -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "Gestor de ventanas: " - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Gestiona las aplicaciones cargadas en la sesión de escritorio" diff -Nru lxsession-edit-0.2.0/po/es_VE.po lxsession-edit-0.2.0~svn20090913/po/es_VE.po --- lxsession-edit-0.2.0/po/es_VE.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/es_VE.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -# Spanish translation of lxsession-edit -# Copyright (C) 2008 THE lxsession-edit'S COPYRIGHT HOLDER -# This file is distributed under the same license as the lxsession-edit package. -# -# Julio Napurí Carlos , 2008. -# -msgid "" -msgstr "" -"Project-Id-Version: lxsession-edit\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2009-05-31 16:28+0200\n" -"Last-Translator: Hugo Florentino \n" -"Language-Team: Spanish \n" -"Language: es\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 1.1.0\n" -"X-Poedit-Language: Spanish\n" - -#: ../src/lxsession-edit.c:362 -msgid "Enabled" -msgstr "Activado" - -#: ../src/lxsession-edit.c:367 -msgid "Application" -msgstr "Aplicación" - -#: ../src/lxsession-edit.c:375 -msgid "Comment" -msgstr "Comentario" - -#: ../data/lxsession-edit.ui.h:1 -msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" -"\n" -"NOTE: This setting will take effect on next login." -msgstr "" -"Advertencia: NO edite esto, a menos que sepa exactamente lo " -"que está haciendo.\n" -"\n" -"NOTA: Este ajuste surtirá efecto la próxima vez que inicie sesión." - -#: ../data/lxsession-edit.ui.h:4 -msgid "Advanced Options" -msgstr "Opciones avanzadas" - -#: ../data/lxsession-edit.ui.h:5 -msgid "Applications automatically started after entering desktop:" -msgstr "Aplicaciones que automáticamente inician después del escritorio:" - -#: ../data/lxsession-edit.ui.h:6 -msgid "Automatically Started Applications" -msgstr "Iniciar automáticamente las aplicaciones" - -#: ../data/lxsession-edit.ui.h:7 -msgid "" -"Command line used to launch window manager\n" -"(The default window manager command for LXDE should be openbox-lxde)" -msgstr "" -"La línea de comandos utilizada para lanzar el gestor de ventanas\n" -"(El programa de línea de comandos de LXDE por omisión debería ser openbox-" -"lxde)" - -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 -msgid "Desktop Session Settings" -msgstr "Configuración de la sesión de escritorio" - -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" -msgstr "Gestor de ventanas: " - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "" diff -Nru lxsession-edit-0.2.0/po/et.po lxsession-edit-0.2.0~svn20090913/po/et.po --- lxsession-edit-0.2.0/po/et.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/et.po 2009-09-05 21:29:07.000000000 +0000 @@ -8,31 +8,29 @@ msgstr "" "Project-Id-Version: lxsession-edit\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" "PO-Revision-Date: 2009-08-23 17:21+0300\n" "Last-Translator: Mattias Põldaru \n" "Language-Team: Gnome Estonian Translation Team \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "Lubatud" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "Rakendus" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "Kommentaar" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" +"Warning: Do NOT touch this unless you know exactly what you are doing.\n" "\n" "NOTE: This setting will take effect on next login." msgstr "" @@ -40,19 +38,19 @@ "\n" "Märkus: Selle sätte muutmine avaldub järgmisel sisselogimisel." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "Laiendatud valikud" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "Rakendused, mis käivitatakse töölauaga koos:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "Isekäivituvad rakendused" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" @@ -60,15 +58,11 @@ "Aknahalduri käivistamise käsurida\n" "(vaikimisi LXDE aknahaldur on openbox-lxde)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "Töölauaseansi sätted" -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "Aknahaldur:" -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "" diff -Nru lxsession-edit-0.2.0/po/eu.po lxsession-edit-0.2.0~svn20090913/po/eu.po --- lxsession-edit-0.2.0/po/eu.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/eu.po 2009-09-05 21:29:07.000000000 +0000 @@ -2,30 +2,29 @@ msgstr "" "Project-Id-Version: lxsession-edit\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" "PO-Revision-Date: \n" "Last-Translator: Alain Mendizabal \n" "Language-Team: Basque \n" -"Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Basque\n" "Plural-Forms: nplurals=2; plural=(n != 1);\\n\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "Gaituta" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "Aplikazioa" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "Iruzkina" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" @@ -36,19 +35,19 @@ "\n" "OHARRA: Ezarpen honek hurrengo saio-hasieran edukiko du eragina." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "Aukera aurreratuak" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "Idazmahaian sartu ondoren automatikoki abiaraziko diren aplikazioak:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "Automatikoki abiarazitako aplikazioak" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" @@ -56,15 +55,10 @@ "Leiho kudeatzailea exekutatzeko komando-lerroa\n" "(LXDE-rako komando lehenetsia openbox-lxde da)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "Idazmahai-saioaren ezarpenak" -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "Leiho kudeatzailea:" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "" diff -Nru lxsession-edit-0.2.0/po/fa.po lxsession-edit-0.2.0~svn20090913/po/fa.po --- lxsession-edit-0.2.0/po/fa.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/fa.po 2009-09-05 21:29:07.000000000 +0000 @@ -3,74 +3,61 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2010-08-24 13:49+0200\n" -"Last-Translator: Hamidreza \n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"Language: fa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.5\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" -msgstr "فعال شده" +msgstr "" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" -msgstr "برنامه" +msgstr "" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" -msgstr "توضیح" +msgstr "" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" "\n" "NOTE: This setting will take effect on next login." msgstr "" -"اخطار: به این گزینه دست نزن تا زمانی که دقیقا بدونی داری چکار " -"می کنی.\n" -"\n" -"نکته: این تغییرات بر روی نشست بعدی اثر خواهد داشت." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" -msgstr "تنظیمات پیشرفته" +msgstr "" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" -msgstr "نرم افزار هایی که بعد از ورود به دسکتاب، خودکار اجرا می شوند:" +msgstr "" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" -msgstr "ابزار های اجرا شده ی خودکار" +msgstr "" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" msgstr "" -"خط فرمان برای اجرا ی مدیر پنجره استفاده شده.\n" -"(مدیر پنجره ی پیشفرض در LXDE باید openbox-lxde باشد.)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" -msgstr "تنظیمات جلسه ای میزکار" - -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" -msgstr "مدیر پنجره" +msgstr "" -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "مدیریت نرم افزار های بارگذاری شده در این جلسه" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " +msgstr "" diff -Nru lxsession-edit-0.2.0/po/fi.po lxsession-edit-0.2.0~svn20090913/po/fi.po --- lxsession-edit-0.2.0/po/fi.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/fi.po 2009-09-05 21:29:07.000000000 +0000 @@ -7,28 +7,27 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" "PO-Revision-Date: 2008-12-02 20:50+0200\n" "Last-Translator: Elias Julkunen \n" "Language-Team: Finnish \n" -"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "Käytössä" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "Sovellus" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "Kommentti" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" @@ -40,19 +39,19 @@ "\n" "Huom: Tämä asetusta käytetään seuraavan kirjautumisen jälkeen." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "Lisäasetukset" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "Automaattisesti käynnistettävät ohjelmat työpöydälle pääsyn jälkeen:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "Automaattisesti käynnistettävät ohjelmat" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" @@ -60,15 +59,10 @@ "Ikkunaohjelman käynnistämiseen käytettävä komento\n" "(Oletuskomento LXDE:lle pitäisi olla openbox-lxde)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "Työpöytäistunnon asetukset" -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "Ikkunakäsittelijä:" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Hallitse automaattisesti käynnistettäviä sovelluksia" diff -Nru lxsession-edit-0.2.0/po/fo.po lxsession-edit-0.2.0~svn20090913/po/fo.po --- lxsession-edit-0.2.0/po/fo.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/fo.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2010-04-18 00:18+0200\n" -"Last-Translator: Gunleif \n" -"Language-Team: LANGUAGE \n" -"Language: fo\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.1\n" - -#: ../src/lxsession-edit.c:362 -msgid "Enabled" -msgstr "Gilda" - -#: ../src/lxsession-edit.c:367 -msgid "Application" -msgstr "Nýtsluskipan" - -#: ../src/lxsession-edit.c:375 -msgid "Comment" -msgstr "Viðmerking" - -#: ../data/lxsession-edit.ui.h:1 -msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" -"\n" -"NOTE: This setting will take effect on next login." -msgstr "" -"Ávaring: BROYT EINKI um tú ikki nágreinliga veitst hvat ið tú " -"gerð.\n" -"\n" -"Gev gætur: Henda seting tekur við, eftir næstu innritan." - -#: ../data/lxsession-edit.ui.h:4 -msgid "Advanced Options" -msgstr "Framkomnir kostir" - -#: ../data/lxsession-edit.ui.h:5 -msgid "Applications automatically started after entering desktop:" -msgstr "Nýtsluskipanir ið sjálvvirknar byrja, eftir at skriviborðið byrjar:" - -#: ../data/lxsession-edit.ui.h:6 -msgid "Automatically Started Applications" -msgstr "Nýtsluskipanir ið sjálvvirknar byrja" - -#: ../data/lxsession-edit.ui.h:7 -msgid "" -"Command line used to launch window manager\n" -"(The default window manager command for LXDE should be openbox-lxde)" -msgstr "" -"Stýriboð nýtt at byrja gluggaleiðara við\n" -"(Forsett stýriboð hjá LXDE átti at verið openbox-lxde)" - -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 -msgid "Desktop Session Settings" -msgstr "Setingar á skriviborðssetu" - -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" -msgstr "Glugga fyrisiti: " - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Umsit nýtsluskipanir ið eru løddar í skriviborðssetuni" diff -Nru lxsession-edit-0.2.0/po/fr.po lxsession-edit-0.2.0~svn20090913/po/fr.po --- lxsession-edit-0.2.0/po/fr.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/fr.po 2009-09-05 21:29:07.000000000 +0000 @@ -7,29 +7,28 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" "PO-Revision-Date: 2009-05-09 03:24+0200\n" "Last-Translator: Cilyan Olowen \n" "Language-Team: LANGUAGE \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 1.1.0\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "Activé" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "Application" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "Commentaire" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" @@ -41,19 +40,19 @@ "\n" "NOTE : Ce paramètre prendra effet à la prochaine connexion." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "Options avancées" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "Application lancées automatiquement après le chargement du bureau :" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "Applications lancées automatiquement :" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" @@ -61,15 +60,10 @@ "Ligne de commande utilisée pour lancer le gestionnaire de fenêtres\n" "(La commande par défaut pour LXDE devrait être openbox-lxde)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "Paramètres de la session" -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "Gestionnaire de fenêtres : " - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Gére les applications chargées dans la session" diff -Nru lxsession-edit-0.2.0/po/frp.po lxsession-edit-0.2.0~svn20090913/po/frp.po --- lxsession-edit-0.2.0/po/frp.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/frp.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2009-10-21 15:53+0200\n" -"Last-Translator: alexandre raymond \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Pootle 1.1.0\n" - -#: ../src/lxsession-edit.c:362 -msgid "Enabled" -msgstr "" - -#: ../src/lxsession-edit.c:367 -msgid "Application" -msgstr "Applicacion" - -#: ../src/lxsession-edit.c:375 -msgid "Comment" -msgstr "Comentéro" - -#: ../data/lxsession-edit.ui.h:1 -msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" -"\n" -"NOTE: This setting will take effect on next login." -msgstr "" - -#: ../data/lxsession-edit.ui.h:4 -msgid "Advanced Options" -msgstr "Opcions avançâyes" - -#: ../data/lxsession-edit.ui.h:5 -msgid "Applications automatically started after entering desktop:" -msgstr "Applicacions lançâyes automaticament dèns LXDE:" - -#: ../data/lxsession-edit.ui.h:6 -msgid "Automatically Started Applications" -msgstr "Applicacions automaticament lançâyes:" - -#: ../data/lxsession-edit.ui.h:7 -msgid "" -"Command line used to launch window manager\n" -"(The default window manager command for LXDE should be openbox-lxde)" -msgstr "" - -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 -msgid "Desktop Session Settings" -msgstr "" - -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" -msgstr "" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "" diff -Nru lxsession-edit-0.2.0/po/gl.po lxsession-edit-0.2.0~svn20090913/po/gl.po --- lxsession-edit-0.2.0/po/gl.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/gl.po 2009-09-05 21:29:07.000000000 +0000 @@ -3,74 +3,61 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2011-06-08 17:32+0200\n" -"Last-Translator: mbouzada \n" -"Language-Team: Proxecto Trasno \n" -"Language: gl\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" -msgstr "Activado" +msgstr "" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" -msgstr "Aplicación" +msgstr "" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" -msgstr "Comentario" +msgstr "" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" "\n" "NOTE: This setting will take effect on next login." msgstr "" -"Advertencia: NON edite isto, a menos que saiba exactamente o " -"que está facendo.\n" -"\n" -"NOTA: Este axuste terá efecto a próxima vez que inicie sesión." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" -msgstr "Opcións avanzadas" +msgstr "" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "" -"Aplicacións que inician automaticamente despois de entrar no escritorio:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" -msgstr "Iniciar automaticamente as aplicacións" +msgstr "" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" msgstr "" -"A liña de ordes utilizada para lanzar o xestor de xanelas\n" -"(O aplicativo de liña de ordes de LXDE por omisión debería ser openbox-lxde)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" -msgstr "Configuración da sesión de escritorio" +msgstr "" -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" -msgstr "Xestor de xanelas:" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Xestionar os aplicativos cargados na sesión de escritorio" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " +msgstr "" diff -Nru lxsession-edit-0.2.0/po/he.po lxsession-edit-0.2.0~svn20090913/po/he.po --- lxsession-edit-0.2.0/po/he.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/he.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2010-01-13 23:25+0200\n" -"Last-Translator: Yaron Shahrbani \n" -"Language-Team: LANGUAGE \n" -"Language: he\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.0\n" - -#: ../src/lxsession-edit.c:362 -msgid "Enabled" -msgstr "פעיל" - -#: ../src/lxsession-edit.c:367 -msgid "Application" -msgstr "יישום" - -#: ../src/lxsession-edit.c:375 -msgid "Comment" -msgstr "הערה" - -#: ../data/lxsession-edit.ui.h:1 -msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" -"\n" -"NOTE: This setting will take effect on next login." -msgstr "" -"אזהרה: אין בזה אלא אם כן יש לך מושג במעשיך.\n" -"\n" -"הערה: הגדרות אלו יחלו עם הכניסה הבאה למערכת." - -#: ../data/lxsession-edit.ui.h:4 -msgid "Advanced Options" -msgstr "אפשרויות מתקדמות" - -#: ../data/lxsession-edit.ui.h:5 -msgid "Applications automatically started after entering desktop:" -msgstr "היישומים שמופעלים אוטומטית לאחר הכניסה לשולחן העבודה:" - -#: ../data/lxsession-edit.ui.h:6 -msgid "Automatically Started Applications" -msgstr "יישומים שמופעלים אוטומטית" - -#: ../data/lxsession-edit.ui.h:7 -msgid "" -"Command line used to launch window manager\n" -"(The default window manager command for LXDE should be openbox-lxde)" -msgstr "" -"שורת הפקודה המשמשת לטעינת מנהל החלונות\n" -"(פקודת מנהל החלונות כברירת המחדל עבור LXDE אמורה להיות openbox-lxde)" - -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 -msgid "Desktop Session Settings" -msgstr "הגדרות השימוש בשולחן העבודה" - -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" -msgstr "מנהל החלונות: " - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "ניהול יישומים הנטענים עם עליית שולחן העבודה" diff -Nru lxsession-edit-0.2.0/po/hr.po lxsession-edit-0.2.0~svn20090913/po/hr.po --- lxsession-edit-0.2.0/po/hr.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/hr.po 2009-09-05 21:29:07.000000000 +0000 @@ -1,75 +1,65 @@ -# Boljsa -# Ivica Kolić <>, 2010. msgid "" msgstr "" "Project-Id-Version: lxsession-edit_hr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2011-02-23 00:26+0200\n" -"Last-Translator: zvacet \n" -"Language-Team: \n" -"Language: hr\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" +"PO-Revision-Date: \n" +"Last-Translator: Boljsa \n" +"Language-Team: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 2.0.5\n" "X-Poedit-Language: Croatian\n" "X-Poedit-Country: CROATIA\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" -msgstr "Omogućeno" +msgstr "Omogueno" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" -msgstr "Aplikcija" +msgstr "Aplikacija" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "Komentar" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" "\n" "NOTE: This setting will take effect on next login." msgstr "" -"Upozorenje: NE diraj ovo osim ako točno znaš što radiš.\n" +"Upozorenje: NE diraj ovo osim ako tono zna to radi.\n" "\n" -"NAPOMENA: Ova postavka će se primjeniti pri sljedećoj prijavi." +"NAPOMENA: Ova postavka e se primjeniti pri sljedeoj prijavi." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "Napredne Postavke" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" -msgstr "Aplikacije koje se automatski pokreću nakon ulaska na radnu površinu:" +msgstr "Aplikacije koje se automatski pokreu nakon ulaska na radnu povrinu:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "Automatski Pokrenute Aplikacije" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" msgstr "" -"Naredbeni redak korišen za pokretanje upravitelja prozora\n" -"(Zadana naredba za upravitelja prozora za LXDE trebala bi biti openbox-lxde)" +"Komandna linija navikla na pokretanje upravitelja prozora\n" +"(Standardna naredba za upravitelj prpzora za LXDE trebala bi biti openbox-" +"lxde)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" -msgstr "Postavke sesije radne površine" +msgstr "Postavke Sesije Radne Povrine" -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" -msgstr "Upravitelj prozora: " - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Upravljaj aplikacijama učitanima u sesiji radne površine" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " +msgstr "Upravitelj Prozora:" diff -Nru lxsession-edit-0.2.0/po/hu.po lxsession-edit-0.2.0~svn20090913/po/hu.po --- lxsession-edit-0.2.0/po/hu.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/hu.po 2009-09-05 21:29:07.000000000 +0000 @@ -2,11 +2,10 @@ msgstr "" "Project-Id-Version: lxsession-edit\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" "PO-Revision-Date: \n" "Last-Translator: SZERVÁC Attila \n" "Language-Team: Hungarian \n" -"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -14,22 +13,21 @@ "X-Poedit-Language: Hungarian\n" "X-Poedit-Country: HUNGARY\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "Bekapcsolva" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "Alkalmazás" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "Megjegyzés" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" +"Warning: Do NOT touch this unless you know exactly what you are doing.\n" "\n" "NOTE: This setting will take effect on next login." msgstr "" @@ -37,19 +35,19 @@ "\n" "MEGJEGYZÉS: E beállítások a következő indításkor hatnak." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "Haladó lehetőségek" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "Az asztali környezetbe érkezéskor önműködően induló alkalmazások:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "Önműködően indított alkalmazások" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" @@ -57,15 +55,11 @@ "Az ablakkezelő indítására használt parancssor\n" "(Az alap LXDE ablakkezelő parancs az openbox-lxde )" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "Asztali folyamat beállításai" -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "Ablakkezelő: " -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Az asztali folyamat alkalmazásainak kezelése" diff -Nru lxsession-edit-0.2.0/po/id.po lxsession-edit-0.2.0~svn20090913/po/id.po --- lxsession-edit-0.2.0/po/id.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/id.po 2009-09-13 10:23:46.000000000 +0000 @@ -1,34 +1,33 @@ -# Indonesian translations for lxsession-edit package. -# Copyright (C) YEAR THE lxsession-edit'S COPYRIGHT HOLDER -# This file is distributed under the same license as the lxsession-edit package. -# Andhika Padmawan , Rahman Yusri Aftian , 2009. -# +# Indonesian translations for lxsession-edit package. +# Copyright (C) YEAR THE lxsession-edit'S COPYRIGHT HOLDER +# This file is distributed under the same license as the lxsession-edit package. +# Andhika Padmawan , Rahman Yusri Aftian , 2009. +# msgid "" msgstr "" "Project-Id-Version: lxsession-edit\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" "PO-Revision-Date: 2009-03-04 22:57+0700\n" "Last-Translator: Andhika Padmawan \n" "Language-Team: Indonesian \n" -"Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "Aktifkan" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "Aplikasi" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "Komentar" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" @@ -40,19 +39,19 @@ "\n" "CATATAN: Pengaturan ini akan diterapkan pada log masuk berikutnya." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "Opsi Mahir" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "Aplikasi yang otomatis berjalan setelah memasuki desktop:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "Aplikasi Berjalan Otomatis" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" @@ -60,15 +59,10 @@ "Baris perintah yang digunakan untuk menjalankan manajer jendela\n" "(Perintah manajer jendela standar untuk LXDE harus merupakan openbox-lxde)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "Pengaturan Sesi Desktop" -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "Manajer Jendela:" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Kelola aplikasi yang dimuat pada sesi desktop" diff -Nru lxsession-edit-0.2.0/po/it.po lxsession-edit-0.2.0~svn20090913/po/it.po --- lxsession-edit-0.2.0/po/it.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/it.po 2009-09-05 21:29:07.000000000 +0000 @@ -7,32 +7,30 @@ msgstr "" "Project-Id-Version: lxsession-edit 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2010-01-17 18:07+0200\n" -"Last-Translator: Andrea \n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" +"PO-Revision-Date: 2009-04-17 19:30+0200\n" +"Last-Translator: Alessandro Pellizzari \n" "Language-Team: \n" -"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.0\n" +"X-Generator: Pootle 1.1.0\n" "X-Poedit-Language: Italian\n" "X-Poedit-Country: ITALY\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "Attivato" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "Applicazione" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "Commento" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" @@ -43,19 +41,19 @@ "quello che si sta facendo.\n" "NOTA: Queste impostazioni avranno effetto al prossimo login" -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "Opzioni avanzate" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "Applicazioni avviate automaticamente all'avvio della scrivania:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "Applicazioni avviate automaticamente" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" @@ -63,16 +61,10 @@ "Linea di comando usata per avviare il gestore di finestre\n" "(Il gestore di finestre standard per LXDE dovrebbe essere openbox-lxde)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "Impostazioni della sessione" -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "Gestore di finestre: " - -# ho ignorato "desktop" così come avevate fatto nella stringa 8 -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Gestisce le applicazioni avviate nella sessione" diff -Nru lxsession-edit-0.2.0/po/ja.po lxsession-edit-0.2.0~svn20090913/po/ja.po --- lxsession-edit-0.2.0/po/ja.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/ja.po 2009-09-05 21:29:07.000000000 +0000 @@ -8,29 +8,28 @@ msgstr "" "Project-Id-Version: lxsession-edit 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" +"POT-Creation-Date: 2009-05-01 18:33+0900\n" "PO-Revision-Date: 2009-05-01 18:33+0900\n" "Last-Translator: Hironao Komatsu \n" "Language-Team: Japanese \n" -"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "有効" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "アプリケーション" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "コメント" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" @@ -42,19 +41,19 @@ "\n" "NOTE: この設定は次回のログインから有効です。" -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "高度な設定" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "デスクトップ環境下で自動的に開始するアプリケーション:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "自動的に開始するアプリケーション" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" @@ -62,15 +61,10 @@ "ウィンドウマネージャを立ち上げるコマンドライン\n" "(LXDE のデフォルトのウィンドウマネージャのコマンドは openbox-lxde です)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "デスクトップセッションの設定" -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "ウィンドウマネージャ: " - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "デスクトップセッションでロードされるアプリケーションを管理します" diff -Nru lxsession-edit-0.2.0/po/ko.po lxsession-edit-0.2.0~svn20090913/po/ko.po --- lxsession-edit-0.2.0/po/ko.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/ko.po 2009-09-05 21:29:07.000000000 +0000 @@ -8,28 +8,27 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" @@ -37,32 +36,28 @@ "NOTE: This setting will take effect on next login." msgstr "" -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" msgstr "" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "" -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" -msgstr "" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "" diff -Nru lxsession-edit-0.2.0/po/lg.po lxsession-edit-0.2.0~svn20090913/po/lg.po --- lxsession-edit-0.2.0/po/lg.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/lg.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2011-06-14 00:03+0200\n" -"Last-Translator: kizito \n" -"Language-Team: LANGUAGE \n" -"Language: lg\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" - -# Heading for the feature activation tick boxes -#: ../src/lxsession-edit.c:362 -msgid "Enabled" -msgstr "Ebikola" - -# Heading for the selectable features -#: ../src/lxsession-edit.c:367 -msgid "Application" -msgstr "Puloguramu" - -# Heading for the feature descriptions -#: ../src/lxsession-edit.c:375 -msgid "Comment" -msgstr "Okunnyonyola" - -# Warning about changing the window manager -#: ../data/lxsession-edit.ui.h:1 -msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" -"\n" -"NOTE: This setting will take effect on next login." -msgstr "" -"Kulabula: Bino TOBIKYUSA okugyako nga wekakasa ky'okola.\n" -"\n" -"GENDERERA: Ekitgekebwa wano kijjakukolera mu lutuula lw'oddako " -"okutandika." - -# Title for the window manager setting tab -#: ../data/lxsession-edit.ui.h:4 -msgid "Advanced Options" -msgstr "Entegeka ez'etaagisa bumanyirivu" - -# Description text on the automatically started applications tab -#: ../data/lxsession-edit.ui.h:5 -msgid "Applications automatically started after entering desktop:" -msgstr "Puloguramu ezinaatandikirawo ng'ofunye awakolerwa:" - -# Title on the automatically started application selection tab -#: ../data/lxsession-edit.ui.h:6 -msgid "Automatically Started Applications" -msgstr "Puloguramu ezinaatandikirawo" - -# This is the text that appears in the tool-tip when youhover the cursor over the entry box. -#: ../data/lxsession-edit.ui.h:7 -msgid "" -"Command line used to launch window manager\n" -"(The default window manager command for LXDE should be openbox-lxde)" -msgstr "" -"Wano we wagenda ekiragiro eky'omu kiwandikiro ekitandisa puloguramu " -"etabaganya awakolerwa\n" -"(Mu ebya bulijjo, bw'oba wetaaga awakolerwa wakika kya LXDE, okozesanga " -"puloguramu openbox-lxde)" - -# This is the title of the window for the desktop session settings program -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 -msgid "Desktop Session Settings" -msgstr "Entegeka za Lutuula Lw'awakolerwa" - -# This is the caption in front of the window manager entry box o the advanced settings tab -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" -msgstr "Puloguramu etabaganya awakolerwa:" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Tegeka puloguramu eziba zitandikir'awamu n'olutuula lw'awakolerwa" diff -Nru lxsession-edit-0.2.0/po/lt.po lxsession-edit-0.2.0~svn20090913/po/lt.po --- lxsession-edit-0.2.0/po/lt.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/lt.po 2009-09-05 21:29:07.000000000 +0000 @@ -7,54 +7,52 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2011-06-11 23:44+0200\n" -"Last-Translator: Julius \n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" +"PO-Revision-Date: 2009-04-06 10:39+0200\n" +"Last-Translator: Anony mous \n" "Language-Team: LANGUAGE \n" -"Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" -"100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 2.0.5\n" +"X-Generator: Pootle 1.1.0\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "Įjungta" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "Programa" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "Komentaras" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" "\n" "NOTE: This setting will take effect on next login." msgstr "" -"Perspėjimas: Nekeiskite šių nustatymų, nebent žinote ką darote!\n" +"Perspėjimas: Nekeiskite šių nustatymų, nebent žinote ką " +"darote.\n" "\n" "Pastaba: Kad šis nustatymas įsigaliotų, reiks atsijungti nuo sistemos." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" -msgstr "Sudėtingesni" +msgstr "Sudėtingesni nustatymai" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "Automatiškai paleidžiamos programos prisijungus:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "Automatiškai paleidžiamos programos" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" @@ -62,14 +60,10 @@ "Komandinė eilutė langų tvarkyklei paleisti\n" "(Numatytoji LXDE langų tvarkyklė yra openbox-lxde)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "Sesijos nustatymai" -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" -msgstr "Langų tvarkyklė:" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Tvarkyti programas, paleidžiamas kartu su darbastaliu" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " +msgstr "Langų tvarkyklė: " diff -Nru lxsession-edit-0.2.0/po/ml.po lxsession-edit-0.2.0~svn20090913/po/ml.po --- lxsession-edit-0.2.0/po/ml.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/ml.po 2009-09-05 21:29:07.000000000 +0000 @@ -8,28 +8,27 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" @@ -37,32 +36,28 @@ "NOTE: This setting will take effect on next login." msgstr "" -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" msgstr "" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "" -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" -msgstr "" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "" diff -Nru lxsession-edit-0.2.0/po/ms.po lxsession-edit-0.2.0~svn20090913/po/ms.po --- lxsession-edit-0.2.0/po/ms.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/ms.po 2009-09-05 21:29:07.000000000 +0000 @@ -7,60 +7,58 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" "PO-Revision-Date: 2009-05-24 06:44+0200\n" "Last-Translator: Payne Samad Loh \n" "Language-Team: LANGUAGE \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 1.1.0\n" # By Phyz -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "Membolehkan" # by Phyz -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "Aplikasi" # by Phyz -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "Komen" # by Phyz -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" "\n" "NOTE: This setting will take effect on next login." msgstr "" -"Amaran: Do NOT ubah sekiranya anda arif apa yang anda " -"lakukan.\n" +"Amaran: Do NOT ubah sekiranya anda arif apa yang anda lakukan.\n" "\n" "NOTE: Tetapan ini akan berkesan setelah log masuk." # by Phyz -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "Pilihan Majuan" # by Phyz -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "Aplikasi dimulakan secara automatik selepas memasuki desktop:" # by Phyz -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "Aplikasi Yang Dimulakan Secara Automatik" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" @@ -69,16 +67,11 @@ "(Arahan pengurus tingkap default untuk LXDE sepatutnya openbox-lxde)" # by Phyz -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "Tetapan Sesi Desktop" # By Phyz -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "Pengurusan Tetingkap: " - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "" diff -Nru lxsession-edit-0.2.0/po/nb.po lxsession-edit-0.2.0~svn20090913/po/nb.po --- lxsession-edit-0.2.0/po/nb.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/nb.po 2009-09-05 21:29:07.000000000 +0000 @@ -3,74 +3,61 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2010-11-03 19:47+0200\n" -"Last-Translator: Sam \n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" -msgstr "Aktivert" +msgstr "" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" -msgstr "Program" +msgstr "" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" -msgstr "Kommentar" +msgstr "" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" "\n" "NOTE: This setting will take effect on next login." msgstr "" -"Advarsel: IKKE rør dette hvis du ikke er helt sikker på hva du " -"holder på med.\n" -"\n" -"MERK: Denne innstillingen endres ved neste innlogging." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" -msgstr "Avanserte innstillinger" +msgstr "" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" -msgstr "Programmer som skal starte automatisk etter innlogging:" +msgstr "" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" -msgstr "Automatisk startede programmer" +msgstr "" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" msgstr "" -"Kommandolinjen blir brukt til å starte vindusbehandleren\n" -"(Standardkommandoen for LXDEs vindusbehandler skal være openbox-lxde)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" -msgstr "Innstillinger for skrivebordssesjon" - -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" -msgstr "Vindusbehandler: _" +msgstr "" -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Håndter program åpne i arbeidsøkta" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " +msgstr "" diff -Nru lxsession-edit-0.2.0/po/nl.po lxsession-edit-0.2.0~svn20090913/po/nl.po --- lxsession-edit-0.2.0/po/nl.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/nl.po 2009-09-05 21:29:07.000000000 +0000 @@ -1,47 +1,41 @@ -# Dutch translation for the lxsession-edit package. -# Copyright (C) the author of the lxsession-edit package. -# This file is distributed under the same license as the -# lxsession-edit package. -# Pjotr, 2011. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: lxsession-edit\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-27 04:04+0000\n" -"PO-Revision-Date: 2011-06-13 11:34+0200\n" -"Last-Translator: Pjotr\n" -"Language-Team: Dutch\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" +"PO-Revision-Date: 2009-05-04 15:26+0100\n" +"Last-Translator: Sander De Voogdt \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nl (Dutch)\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "Ingeschakeld" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" -msgstr "Toepassing" +msgstr "Applicatie" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "Commentaar" #: ../data/lxsession-edit.glade.h:1 msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" +"Warning: Do NOT touch this unless you know exactly what you are doing.\n" "\n" "NOTE: This setting will take effect on next login." msgstr "" -"Waarschuwing: Kom hier NIET aan, tenzij u precies weet wat u " -"doet.\n" +"Waarschuwing: Verander NIETS aan deze instellingen tenzij U exact weet wat u doet.\n" "\n" -"LET OP: Deze instelling zal pas van kracht zijn na de volgende " -"aanmelding." +"NOTA: Deze verandering zal pas van kracht zijn na de volgende login." #: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" @@ -49,30 +43,25 @@ #: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" -msgstr "" -"Toepassingen die automatisch starten na verschijnen van bureaublad:" +msgstr "Applicaties die automatisch starten bij het ingloggen:" #: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" -msgstr "Automatisch Gestarte Toepassingen" +msgstr "Automatisch gestarte applicaties" #: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" msgstr "" -"Opdrachtregel die gebruikt wordt om de vensterbeheerder te starten\n" -"(De standaardopdracht voor de vensterbeheerder voor LXDE, zou openbox-lxde " -"moeten zijn)" +"Opdrachtregel die gebruikt wordt op de window manager te starten\n" +"(Het standaard window manager commando voor LXDE is openbox-lxde)" -#: ../data/lxsession-edit.glade.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" -msgstr "Bureaublad Sessie-instellingen" +msgstr "Desktop Sessie Instellingen" #: ../data/lxsession-edit.glade.h:10 msgid "Window Manager: " -msgstr "Vensterbeheerder: " +msgstr "Window Manager:" -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Beheer toepassingen die geladen zijn in de bureaubladsessie" diff -Nru lxsession-edit-0.2.0/po/nn.po lxsession-edit-0.2.0~svn20090913/po/nn.po --- lxsession-edit-0.2.0/po/nn.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/nn.po 2009-09-05 21:29:07.000000000 +0000 @@ -7,16 +7,15 @@ msgstr "" "Project-Id-Version: lxsession-edit\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2009-12-31 00:12+0100\n" +"POT-Creation-Date: 2009-07-27 19:42+0200\n" +"PO-Revision-Date: 2009-07-27 20:06+0200\n" "Last-Translator: Karl Ove Hufthammer \n" "Language-Team: Norwegian Nynorsk \n" -"Language: nn\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 0.3\n" #: ../src/lxsession-edit.c:362 msgid "Enabled" @@ -30,7 +29,7 @@ msgid "Comment" msgstr "Merknad" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" @@ -42,19 +41,19 @@ "\n" "MERK: Denne innstillinga trer først i kraft ved neste innlogging." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "Avanserte val" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "Program som skal startast automatisk ved innlogginga:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "Automatisk starta program" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" @@ -62,15 +61,10 @@ "Kommandolinje brukt til å køyra vindaugshandsamar.\n" "(Standard vindaugshandsamar for LXDE er «openbox-lxde».)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "Øktoppsett" -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "Vindaugshandsamar: " - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Handsam program lasta i skrivebordsøkt" diff -Nru lxsession-edit-0.2.0/po/pa.po lxsession-edit-0.2.0~svn20090913/po/pa.po --- lxsession-edit-0.2.0/po/pa.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/pa.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# A S Alam , 2010. -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2010-10-10 08:09+0530\n" -"Last-Translator: A S Alam \n" -"Language-Team: Punjabi/Panjabi \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.1\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" - -#: ../src/lxsession-edit.c:362 -msgid "Enabled" -msgstr "ਚਾਲੂ ਹੈ" - -#: ../src/lxsession-edit.c:367 -msgid "Application" -msgstr "ਐਪਲੀਕੇਸ਼ਨ" - -#: ../src/lxsession-edit.c:375 -msgid "Comment" -msgstr "ਟਿੱਪਣੀ" - -#: ../data/lxsession-edit.ui.h:1 -msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" -"\n" -"NOTE: This setting will take effect on next login." -msgstr "" -"ਸਾਵਧਾਨ:ਜੇ ਤੁਹਾਨੂੰ ਇਹ ਪਤਾ ਨਾ ਹੋਵੇ ਕਿ ਤੁਸੀਂ ਕਰਨ ਜਾ ਰਹੇ ਹੋ ਤਾਂ ਕੁਝ ਨਾ ਕਰੋ।\n" -"\n" -"ਨੋਟ: ਇਹ ਸੈਟਿੰਗ ਅਗਲੀ ਵਾਰ ਲਾਗਇਨ ਕਰਨ ਦੇ ਸਮੇਂ ਪਰਭਾਵੀ ਹੋਵੇਗੀ।" - -#: ../data/lxsession-edit.ui.h:4 -msgid "Advanced Options" -msgstr "ਤਕਨੀਕੀ ਚੋਣਾਂ" - -#: ../data/lxsession-edit.ui.h:5 -msgid "Applications automatically started after entering desktop:" -msgstr "ਡੈਸਕਟਾਪ 'ਚ ਆਉਣ ਦੇ ਬਾਅਦ ਐਪਲੀਕੇਸ਼ਨ ਆਟੋਮੈਟਿਕ ਸ਼ੁਰੂ ਕੀਤੀਆਂ ਜਾਂਦੀਆਂ ਹਨ:" - -#: ../data/lxsession-edit.ui.h:6 -msgid "Automatically Started Applications" -msgstr "ਆਟੋਮੈਟਿਕ ਸ਼ੁਰੂ ਐਪਲੀਕੇਸ਼ਨ" - -#: ../data/lxsession-edit.ui.h:7 -msgid "" -"Command line used to launch window manager\n" -"(The default window manager command for LXDE should be openbox-lxde)" -msgstr "" -"ਵਿੰਡੋ ਮੈਨੇਜਰ ਨੂੰ ਚਲਾਉਣ ਵਾਲੀ ਕਮਾਂਡ ਲਾਈਨ\n" -"(LXDE ਲਈ ਡਿਫਾਲਟ ਵਿੰਡੋ ਮੈਨੇਜਰ openbox-lxde ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ)" - -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 -msgid "Desktop Session Settings" -msgstr "ਡੈਸਕਟਾਪ ਸ਼ੈਸ਼ਨ ਸੈਟਿੰਗ" - -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" -msgstr "ਵਿੰਡੋ ਮੈਨੇਜਰ: " - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "ਡੈਸਕਟਾਪ ਸ਼ੈਸ਼ਨ ਵਿੱਚ ਲੋਡ ਹੋਣ ਵਾਲੀਆਂ ਐਪਲੀਕੇਸ਼ਨ ਦਾ ਪਰਬੰਧ" diff -Nru lxsession-edit-0.2.0/po/pl.po lxsession-edit-0.2.0~svn20090913/po/pl.po --- lxsession-edit-0.2.0/po/pl.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/pl.po 2009-09-05 21:29:07.000000000 +0000 @@ -8,70 +8,62 @@ msgstr "" "Project-Id-Version: lxsession-edit\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2011-07-13 02:09+0200\n" -"Last-Translator: Piotr \n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" +"PO-Revision-Date: 2009-03-07 13:06-0000\n" +"Last-Translator: Artur Kruszewski \n" "Language-Team: Polish\n" -"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 2.0.5\n" +"X-Generator: KBabel 1.11.4\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "Włączone" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" -msgstr "Program" +msgstr "Aplikacja" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "Komentarz" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" "\n" "NOTE: This setting will take effect on next login." msgstr "" -"Ostrzeżenie: Nie dotykaj tego, chyba, że wiesz dokładnie, co " -"robisz.\n" +"Uwaga: Nie dotykaj tego chyba, że dokładnie wiesz co robisz.\n" "\n" -"UWAGA: Efekty zmian będą widoczne po następnym zalogowaniu." +"NOTA: Efekty zmian będą widoczne po następnym logowaniu." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" -msgstr "Opcje zaawansowane" +msgstr "Zaawansowane Opcje" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "Programy uruchamiane automatycznie po wejściu na pulpit:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" -msgstr "Programy uruchamiane automatycznie" +msgstr "Automatycznie Uruchomione Aplikacje" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" msgstr "" "Polecenie użyte do uruchomienia menedżera okien\n" -"(Domyślnie dla LXDE powinno być openbox-lxde)" +"(Domyślnie dla LXDE powinno być openbox-lxde" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "Ustawienia sesji" -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" -msgstr "Menedżer okien:" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Zarządzaj programami uruchamianymi wraz ze środowiskiem LXDE" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " +msgstr "Menedżer Okien: " diff -Nru lxsession-edit-0.2.0/po/ps.po lxsession-edit-0.2.0~svn20090913/po/ps.po --- lxsession-edit-0.2.0/po/ps.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/ps.po 2009-09-05 21:29:07.000000000 +0000 @@ -8,28 +8,27 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" @@ -37,32 +36,28 @@ "NOTE: This setting will take effect on next login." msgstr "" -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" msgstr "" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "" -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" -msgstr "" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "" diff -Nru lxsession-edit-0.2.0/po/pt.po lxsession-edit-0.2.0~svn20090913/po/pt.po --- lxsession-edit-0.2.0/po/pt.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/pt.po 2009-09-05 21:29:07.000000000 +0000 @@ -1,78 +1,73 @@ # Portuguese translation of lxsession-edit # Copyright (C) 2009, THE lxsession-edit COPYRIGHT HOLDER # This file is distributed under the same license as the lxsession-edit package. -# Sérgio Marques 2009-2010 -# Adaptado ao acordo ortográfico de 1990 +# Sérgio Marques , 2009 +# msgid "" msgstr "" -"Project-Id-Version: lxsessionedit\n" +"Project-Id-Version: lxsessionedit 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2011-06-10 20:12+0200\n" -"Last-Translator: Sérgio \n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" +"PO-Revision-Date: 2009-05-05 15:43-0000\n" +"Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese\n" -"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" "X-Poedit-Language: Portuguese\n" "X-Poedit-Country: PORTUGAL\n" "X-Poedit-SourceCharset: utf-8\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" -msgstr "Ativo" +msgstr "Activado" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "Aplicação" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "Comentário" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" +"Warning: Do NOT touch this unless you know exactly what you are doing.\n" "\n" "NOTE: This setting will take effect on next login." msgstr "" -"Aviso: Não MEXA aqui a menos que saiba exatamente o que está a " -"fazer.\n" +"Aviso: NÃO mexa aqui a menos que saiba exactamente o que está a fazer.\n" "\n" "NOTA: Esta definição produzirá efeitos no próximo início de sessão." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" -msgstr "Opções avançadas" +msgstr "Opções Avançadas" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "Aplicações iniciadas automaticamente com o ambiente de trabalho:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" -msgstr "Aplicações iniciadas automaticamente" +msgstr "Aplicações Iniciadas Automaticamente" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" msgstr "" -"Linha de comandos para iniciar o gestor de janelas\n" -"(O gestor de janelas por omissão do LXDE deve ser openbox-lxde)" +"Linha de comandos para lançar gestor de janelas\n" +"(O gestor de janelas padrão do LXDE deve ser openbox-lxde)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" -msgstr "Definições da sessão" +msgstr "Definições da Sessão" + +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " +msgstr "Gestor de Janelas:" + -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" -msgstr "Gestor de janelas:" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Gestão das aplicações carregadas pela sessão" + diff -Nru lxsession-edit-0.2.0/po/pt_BR.po lxsession-edit-0.2.0~svn20090913/po/pt_BR.po --- lxsession-edit-0.2.0/po/pt_BR.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/pt_BR.po 2009-09-05 21:29:07.000000000 +0000 @@ -2,75 +2,69 @@ # Copyright (C) 2009 The lxsession-edit authors. # This file is distributed under the same license as the lxsession-edit package. # Henrique P. Machado , 2009. -# Sérgio Cipolla , 2011. # msgid "" msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2011-06-10 16:02+0200\n" -"Last-Translator: Sérgio \n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" +"PO-Revision-Date: 2009-03-11 19:08-0300\n" +"Last-Translator: Henrique P. Machado \n" "Language-Team: Brazilian Portuguese \n" -"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Pootle 2.0.5\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "Habilitado" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "Aplicativo" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "Comentário" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" "\n" "NOTE: This setting will take effect on next login." msgstr "" -"Aviso: NÃO toque nisto a não ser que você saiba exatamente o " +"Aviso: Não toque nisto a não ser que você saiba exatamente o " "que está fazendo.\n" "\n" -"NOTA: esta configuração terá efeito somente na próxima sessão." +"NOTA: Esta configuração terá efeito somente na próxima sessão." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "Opções avançadas" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" -msgstr "Aplicativos iniciados automaticamente após entrar no ambiente gráfico:" +msgstr "" +"Aplicativos inicializados automaticamente após entrar no ambiente gráfico:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" -msgstr "Aplicativos iniciados automaticamente" +msgstr "Aplicativos inicializados automaticamente" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" msgstr "" -"Linha de comando usada para lançar o gerenciador de janelas\n" -"(o comando do gerenciador de janelas padrão do LXDE é openbox-lxde)." +"Linha de comando usada para lançar o gerenciador de janelas.\n" +"(O comando do gerenciador de janelas padrão do LXDE deveria ser openbox-" +"lxde)." -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "Configurações de sessão do ambiente gráfico" -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" -msgstr "Gerenciador de janelas:" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Configura aplicativos carregados na sessão do ambiente de trabalho" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " +msgstr "Gerenciador de janelas: " diff -Nru lxsession-edit-0.2.0/po/ro.po lxsession-edit-0.2.0~svn20090913/po/ro.po --- lxsession-edit-0.2.0/po/ro.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/ro.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: LXDE\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2010-01-24 11:10-0800\n" -"Last-Translator: alexxed \n" -"Language-Team: Romanian \n" -"Language: ro\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " -"20)) ? 1 : 2;\n" -"X-Generator: Narro 0.9.4 on http://tradu.softwareliber.ro\n" - -#: ../src/lxsession-edit.c:362 -msgid "Enabled" -msgstr "Activat" - -#: ../src/lxsession-edit.c:367 -msgid "Application" -msgstr "Aplicație" - -#: ../src/lxsession-edit.c:375 -msgid "Comment" -msgstr "Comentariu" - -#: ../data/lxsession-edit.ui.h:1 -msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" -"\n" -"NOTE: This setting will take effect on next login." -msgstr "" -"Avertisment:NU modificați aceste valori decât dacă știți ce " -"faceți.\n" -"\n" -"NOTĂ: Setarea va avea efect la următoarea autentificare." - -#: ../data/lxsession-edit.ui.h:4 -msgid "Advanced Options" -msgstr "Opțiuni avansate" - -#: ../data/lxsession-edit.ui.h:5 -msgid "Applications automatically started after entering desktop:" -msgstr "Aplicații pornite automat după intrarea în mediu de lucru:" - -#: ../data/lxsession-edit.ui.h:6 -msgid "Automatically Started Applications" -msgstr "Aplicații pornite automat" - -#: ../data/lxsession-edit.ui.h:7 -msgid "" -"Command line used to launch window manager\n" -"(The default window manager command for LXDE should be openbox-lxde)" -msgstr "" -"Linia de comandă folosită pentru lansarea gestionarului de ferestre\n" -"(Comanda implicită pentru gestionarul de ferestre LXDE ar trebui să fie " -"openbox-lxde)" - -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 -msgid "Desktop Session Settings" -msgstr "Setări pentru sesiunea de lucru" - -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" -msgstr "Gestionar de ferestre: " - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Gestionați aplicațiile încărcate în sesiunea de lucru" diff -Nru lxsession-edit-0.2.0/po/ru.po lxsession-edit-0.2.0~svn20090913/po/ru.po --- lxsession-edit-0.2.0/po/ru.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/ru.po 2009-09-05 21:29:07.000000000 +0000 @@ -7,31 +7,28 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2011-06-11 20:09+0200\n" -"Last-Translator: Alexander \n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" +"PO-Revision-Date: 2009-04-25 07:43+0200\n" +"Last-Translator: Александр Голубев \n" "Language-Team: LANGUAGE \n" -"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 2.0.5\n" +"X-Generator: Pootle 1.1.0\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "Доступно" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "Приложение" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "Комментарий" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" @@ -41,21 +38,21 @@ "Осторожно: Не изменяйте этого, если Вы не знаете точно, что Вы " "делаете.\n" "\n" -"ЗАМЕЧАНИЕ: Эти настройки будут использованы при следующем подключении." +"ЗАМЕЧАНИЕ: Эти настройки будут использованы при следующем подключении" -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "Расширенные настройки" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "Приложения, автоматически запускаемые после входа:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "Автоматически запускаемые приложения" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" @@ -63,14 +60,10 @@ "Команда запуска оконного менеджера\n" " (По умолчанию используется openbox-lxde)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "Сессионные настройки рабочего стола" -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" -msgstr "Оконный менеджер: " - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Управление приложениями загруженными в сессии рабочего стола" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " +msgstr "Оконный менеджер:_" diff -Nru lxsession-edit-0.2.0/po/si.po lxsession-edit-0.2.0~svn20090913/po/si.po --- lxsession-edit-0.2.0/po/si.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/si.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2011-02-27 08:37+0200\n" -"Last-Translator: Danishka \n" -"Language-Team: LANGUAGE \n" -"Language: si\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" - -#: ../src/lxsession-edit.c:362 -msgid "Enabled" -msgstr "සක්‍රීයයි" - -#: ../src/lxsession-edit.c:367 -msgid "Application" -msgstr "යෙදුම්" - -#: ../src/lxsession-edit.c:375 -msgid "Comment" -msgstr "සටහන" - -#: ../data/lxsession-edit.ui.h:1 -msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" -"\n" -"NOTE: This setting will take effect on next login." -msgstr "" - -#: ../data/lxsession-edit.ui.h:4 -msgid "Advanced Options" -msgstr "උසස් සැකසුම්" - -#: ../data/lxsession-edit.ui.h:5 -msgid "Applications automatically started after entering desktop:" -msgstr "වැඩතලයට පිවිසි පසු යෙදුම් ස්වයංක්‍රීයව අරඹන්න:" - -#: ../data/lxsession-edit.ui.h:6 -msgid "Automatically Started Applications" -msgstr "යෙදුම් ස්වයංක්‍රීයව අරඹන්න" - -#: ../data/lxsession-edit.ui.h:7 -msgid "" -"Command line used to launch window manager\n" -"(The default window manager command for LXDE should be openbox-lxde)" -msgstr "" - -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 -msgid "Desktop Session Settings" -msgstr "වැඩතල සැසි සැකසුම්" - -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" -msgstr "කවුළු කළමණාකරුr: " - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "වැඩතල සැසියක පූරණය වූ යෙදුම් කළමණාකරනය" diff -Nru lxsession-edit-0.2.0/po/sk.po lxsession-edit-0.2.0~svn20090913/po/sk.po --- lxsession-edit-0.2.0/po/sk.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/sk.po 2009-09-05 21:29:07.000000000 +0000 @@ -7,28 +7,27 @@ msgstr "" "Project-Id-Version: lxsesion-edit\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2010-01-16 19:21+0100\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" +"PO-Revision-Date: 2009-02-13 14:53+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" -"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "Zapnuté" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "Aplikácia" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "Komentár" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" @@ -40,19 +39,19 @@ "\n" "Pozn.: Táto voľba sa prejaví pri ďalšom prihlásení." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "Pokročilé možnosti" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "Aplikácie, ktoré sa automaticky spúšťajú pri spustení plochy:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "Automaticky spúšťané aplikácie" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" @@ -60,15 +59,10 @@ "Príkazový riadok, ktorý sa používa na spustenie správcu okien\n" "(Štandardný príkaz správcu okien pre LXDE by mal byť openbox-lxde)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "Nastavenia relácie plochy" -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "Správca okien: " - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Správa aplikácií nahraných v relácii pracovného prostredia" diff -Nru lxsession-edit-0.2.0/po/sl.po lxsession-edit-0.2.0~svn20090913/po/sl.po --- lxsession-edit-0.2.0/po/sl.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/sl.po 2009-09-05 21:29:07.000000000 +0000 @@ -1,73 +1,66 @@ -# msgid "" msgstr "" "Project-Id-Version: lxsession-edit\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2011-06-07 09:26+0200\n" -"Last-Translator: Klemen \n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" +"PO-Revision-Date: 2009-06-28 17:48+0100\n" +"Last-Translator: Matej Gačnik \n" "Language-Team: Slovenian \n" -"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n" -"X-Generator: Pootle 2.0.5\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" +"X-Generator: Pootle 1.1.0\n" "X-Poedit-Language: Slovenian\n" "X-Poedit-Country: SLOVENIA\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "Omogočeno" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "Program" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" -msgstr "Opomba" +msgstr "Komentar" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" +"Warning: Do NOT touch this unless you know exactly what you are doing.\n" "\n" "NOTE: This setting will take effect on next login." msgstr "" -"Opozorilo: Te možnosti se NE dotikajte, razen če veste, kaj " -"delate!\n" +"Pozor: Ne spreminjajte, če niste prepričani o vašem dejanju! \n" "\n" -"OPOMBA: Ta nastavitev bo uveljavljena ob naslednji prijavi v sistem." +"OPOMBA: Te nastavitve bodo prešle v veljavo ob naslednji prijavi v sistem." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" -msgstr "Napredne možnosti" +msgstr "Napredne nastavitve" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" -msgstr "Samodejno začeti programi po vstopu na namizje:" +msgstr "Samodejno zagnani programi po vstopu na namizje:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" -msgstr "Samodejno začeti programi" +msgstr "Samodejno pognani programi" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" msgstr "" -"Ukaz, ki zažene upravljalnika oken\n" -"(privzeti ukaz upravljalnika oken za LXDE je openbox-lxde)" +"Command line used to launch window manager\n" +"(The default window manager command for LXDE should be openbox-lxde)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "Nastavitve namizne seje" -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" -msgstr "Upravljalnik oken:" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Upravljajte s programi, naloženimi v namizni seji" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " +msgstr "Upravitelj oken:" + diff -Nru lxsession-edit-0.2.0/po/sr.po lxsession-edit-0.2.0~svn20090913/po/sr.po --- lxsession-edit-0.2.0/po/sr.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/sr.po 2009-09-13 10:23:46.000000000 +0000 @@ -8,30 +8,28 @@ msgstr "" "Project-Id-Version: LXSession-Edit x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" "PO-Revision-Date: 2009-08-31 12:59+0100\n" "Last-Translator: Jay A. Fleming \n" "Language-Team: \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "Омогућено" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "Програм" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "Примедба" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" @@ -42,19 +40,19 @@ "\n" "ОБАВЕШТЕЊЕ: Ове промене ће се применити од наредног пријављивања." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "Напредне поставке" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "Програми који се аутоматски покрећу при пријављивању:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "Програми који се аутоматски покрећу" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" @@ -62,15 +60,12 @@ "Наредба за покретање Управљача прозора\n" "(Подразумевана наредба за LXDE би била „openbox-lxde“)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "Подесите ваше сесије" -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "Управљача прозорима: " -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Управљање апликацијама учитаним у сесију радне површи" + diff -Nru lxsession-edit-0.2.0/po/sr@latin.po lxsession-edit-0.2.0~svn20090913/po/sr@latin.po --- lxsession-edit-0.2.0/po/sr@latin.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/sr@latin.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -# Serbian translation for LXSession-Edit package -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the LXSession-Edit package. -# Jay A. Fleming , 2009. -# -# -msgid "" -msgstr "" -"Project-Id-Version: LXSession-Edit x\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2009-08-31 12:59+0100\n" -"Last-Translator: Jay A. Fleming \n" -"Language-Team: \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#: ../src/lxsession-edit.c:362 -msgid "Enabled" -msgstr "Omogućeno" - -#: ../src/lxsession-edit.c:367 -msgid "Application" -msgstr "Program" - -#: ../src/lxsession-edit.c:375 -msgid "Comment" -msgstr "Primedba" - -#: ../data/lxsession-edit.ui.h:1 -msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" -"\n" -"NOTE: This setting will take effect on next login." -msgstr "" -"PAŽNJA: NE MENJAJTE OVO ako ne znate šta radite.\n" -"\n" -"OBAVEŠTENJE: Ove promene će se primeniti od narednog prijavljivanja." - -#: ../data/lxsession-edit.ui.h:4 -msgid "Advanced Options" -msgstr "Napredne postavke" - -#: ../data/lxsession-edit.ui.h:5 -msgid "Applications automatically started after entering desktop:" -msgstr "Programi koji se automatski pokreću pri prijavljivanju:" - -#: ../data/lxsession-edit.ui.h:6 -msgid "Automatically Started Applications" -msgstr "Programi koji se automatski pokreću" - -#: ../data/lxsession-edit.ui.h:7 -msgid "" -"Command line used to launch window manager\n" -"(The default window manager command for LXDE should be openbox-lxde)" -msgstr "" -"Naredba za pokretanje Upravljača prozora\n" -"(Podrazumevana naredba za LXDE bi bila „openbox-lxde“)" - -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 -msgid "Desktop Session Settings" -msgstr "Podesite vaše sesije" - -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" -msgstr "Upravljača prozorima: " - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Upravljanje aplikacijama učitanim u sesiju radne površi" diff -Nru lxsession-edit-0.2.0/po/sv.po lxsession-edit-0.2.0~svn20090913/po/sv.po --- lxsession-edit-0.2.0/po/sv.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/sv.po 2009-09-05 21:29:07.000000000 +0000 @@ -7,30 +7,27 @@ msgstr "" "Project-Id-Version: lxsession-edit\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2011-06-08 12:48+0200\n" -"Last-Translator: Martin \n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" +"PO-Revision-Date: 2009-01-05 12:38+0100\n" +"Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" -"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "Aktiverad" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "Program" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "Kommentar" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" @@ -42,19 +39,19 @@ "OBSERVERA: Denna inställning kommer att bli aktiv vid nästa " "inloggning." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "Avancerade alternativ" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "Program som automatiskt startas efter skrivbordsinloggning:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "Automatiskt startade program" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" @@ -62,14 +59,10 @@ "Kommandorad som används för att starta fönsterhanteraren\n" "(Standardkommandot för fönsterhanterare för LXDE ska vara openbox-lxde)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "Inställningar för skrivbordssession" -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" -msgstr "Fönsterhanterare:" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Hantera program som laddas i skrivbordssessionen" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " +msgstr "Fönsterhanterare: " diff -Nru lxsession-edit-0.2.0/po/te.po lxsession-edit-0.2.0~svn20090913/po/te.po --- lxsession-edit-0.2.0/po/te.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/te.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2011-07-12 17:29+0200\n" -"Last-Translator: PraveenIlla \n" -"Language-Team: LANGUAGE \n" -"Language: te\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" - -#: ../src/lxsession-edit.c:362 -msgid "Enabled" -msgstr "చేతనమైంది" - -#: ../src/lxsession-edit.c:367 -msgid "Application" -msgstr "అనువర్తనం" - -#: ../src/lxsession-edit.c:375 -msgid "Comment" -msgstr "వ్యాఖ్య" - -#: ../data/lxsession-edit.ui.h:1 -msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" -"\n" -"NOTE: This setting will take effect on next login." -msgstr "" -"హెచ్చరిక: ఏమి చేస్తున్నారో మీకు ఖచ్చితంగా తెలియకపోతే దీనిని ఏమీ చేయ వద్దు.\n" -"\n" -"గమనిక: ఈ అమరిక తదుపరి లాగిన్ నందు ప్రభావం చూపుతుంది." - -#: ../data/lxsession-edit.ui.h:4 -msgid "Advanced Options" -msgstr "ఉన్నత ఐచ్ఛికాలు" - -#: ../data/lxsession-edit.ui.h:5 -msgid "Applications automatically started after entering desktop:" -msgstr "డెస్క్‍టాప్‌లోనికి ప్రవేశించిన తరువాత స్వయంచాలకంగా ప్రారంభమయ్యే అనువర్తనాలు:" - -#: ../data/lxsession-edit.ui.h:6 -msgid "Automatically Started Applications" -msgstr "స్వయంచాలకంగా ప్రారంభమయ్యే అనువర్తనాలు" - -#: ../data/lxsession-edit.ui.h:7 -msgid "" -"Command line used to launch window manager\n" -"(The default window manager command for LXDE should be openbox-lxde)" -msgstr "" -"విండో నిర్వాహకాన్ని ప్రారంభించుటకు వాడే కమాండు లైన్\n" -"(LXDE కొరకు అప్రమేయ విండో నిర్వాహక కమాండు)" - -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 -msgid "Desktop Session Settings" -msgstr "డెస్క్‍టాప్ చర్యాకాలపు అమరికలు" - -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" -msgstr "విండో నిర్వాహకం:" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "డెస్క్‍టాప్ చర్యాకాలంలో లోడయ్యే అనువర్తనాలను నిర్వహించు" diff -Nru lxsession-edit-0.2.0/po/th.po lxsession-edit-0.2.0~svn20090913/po/th.po --- lxsession-edit-0.2.0/po/th.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/th.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../src/lxsession-edit.c:362 -msgid "Enabled" -msgstr "" - -#: ../src/lxsession-edit.c:367 -msgid "Application" -msgstr "" - -#: ../src/lxsession-edit.c:375 -msgid "Comment" -msgstr "" - -#: ../data/lxsession-edit.ui.h:1 -msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" -"\n" -"NOTE: This setting will take effect on next login." -msgstr "" - -#: ../data/lxsession-edit.ui.h:4 -msgid "Advanced Options" -msgstr "" - -#: ../data/lxsession-edit.ui.h:5 -msgid "Applications automatically started after entering desktop:" -msgstr "" - -#: ../data/lxsession-edit.ui.h:6 -msgid "Automatically Started Applications" -msgstr "" - -#: ../data/lxsession-edit.ui.h:7 -msgid "" -"Command line used to launch window manager\n" -"(The default window manager command for LXDE should be openbox-lxde)" -msgstr "" - -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 -msgid "Desktop Session Settings" -msgstr "" - -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" -msgstr "" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "" diff -Nru lxsession-edit-0.2.0/po/tr.po lxsession-edit-0.2.0~svn20090913/po/tr.po --- lxsession-edit-0.2.0/po/tr.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/tr.po 2009-09-05 21:29:07.000000000 +0000 @@ -3,73 +3,61 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2011-06-18 16:20+0200\n" -"Last-Translator: Necdet \n" +"POT-Creation-Date: 2009-05-01 15:32+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.5\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" -msgstr "Etkin" +msgstr "" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" -msgstr "Uygulama" +msgstr "" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" -msgstr "Yorum" +msgstr "" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" "\n" "NOTE: This setting will take effect on next login." msgstr "" -"Uyarı: Ne yaptığınızı tam olarak bilmiyorsanız buna DOKUNMAYIN .\n" -"\n" -"NOT: Bu değişiklik bir sonraki girişte etkinleşecek." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" -msgstr "Gelişmiş Seçenekler" +msgstr "" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" -msgstr "Masaüstüne girdikten sonra kendiliğinden başlayan uygulamalar:" +msgstr "" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" -msgstr "Kendiliğinden başlayan uygulamalar" +msgstr "" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" msgstr "" -"Pencere yöneticisini açmak için kullanılan komut satırı\n" -"(LXDE için öntanımlı pencere yöneticisi komutu openbox-lxde olmalı)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" -msgstr "Masaüstü Oturumu Ayarları" +msgstr "" -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" -msgstr "Pencere Yöneticisi: " - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Masaüstü oturumunda yüklenen uygulamaları yönet" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " +msgstr "" diff -Nru lxsession-edit-0.2.0/po/tt_RU.po lxsession-edit-0.2.0~svn20090913/po/tt_RU.po --- lxsession-edit-0.2.0/po/tt_RU.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/tt_RU.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2011-07-15 08:39+0200\n" -"Last-Translator: Ainur \n" -"Language-Team: LANGUAGE \n" -"Language: tt_RU\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.5\n" - -#: ../src/lxsession-edit.c:362 -msgid "Enabled" -msgstr "Кабызылган" - -#: ../src/lxsession-edit.c:367 -msgid "Application" -msgstr "Кушымта" - -#: ../src/lxsession-edit.c:375 -msgid "Comment" -msgstr "Аңлатма" - -#: ../data/lxsession-edit.ui.h:1 -msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" -"\n" -"NOTE: This setting will take effect on next login." -msgstr "" -"Кисәтү: Әгәр сез нәрсә эшләгәнегезне белмәсәгез, көйләүләрне " -"үзгәртмәгез .\n" -"\n" -"Искәрмә: Бу көйләүләр системага икенче керүдә кулланылачак." - -#: ../data/lxsession-edit.ui.h:4 -msgid "Advanced Options" -msgstr "Өстәмә көйләүләр" - -#: ../data/lxsession-edit.ui.h:5 -msgid "Applications automatically started after entering desktop:" -msgstr "Эш өстәленә кергән вакытта автоматик рәвештә җибәрелүче кушымталар:" - -#: ../data/lxsession-edit.ui.h:6 -msgid "Automatically Started Applications" -msgstr "Автоматик рәвештә җибәрелүче кушымталар" - -#: ../data/lxsession-edit.ui.h:7 -msgid "" -"Command line used to launch window manager\n" -"(The default window manager command for LXDE should be openbox-lxde)" -msgstr "" -"Тәрәзә белән идарә итүченең җибәрү командасы\n" -"(LXDE өчен үрнәк булып openbox-lxde кулланыла)" - -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 -msgid "Desktop Session Settings" -msgstr "Эш өстәленең сессия көйләүләре" - -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" -msgstr "Тәрәзш белән идарә итүче:" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Эш өстәле сессиясендә җибәрелгән кушымалар белән идарә итү" diff -Nru lxsession-edit-0.2.0/po/uk.po lxsession-edit-0.2.0~svn20090913/po/uk.po --- lxsession-edit-0.2.0/po/uk.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/uk.po 2009-09-05 21:29:07.000000000 +0000 @@ -7,31 +7,28 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2011-06-04 12:21+0200\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" +"PO-Revision-Date: 2009-03-04 23:51+0100\n" "Last-Translator: Y P \n" "Language-Team: LANGUAGE \n" -"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 2.0.5\n" +"X-Generator: Pootle 1.1.0\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" -msgstr "Включено" +msgstr "Дозволено" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "Програма" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "Коментар" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" @@ -41,36 +38,33 @@ "Попередження: НЕ ЧІПАЙТЕ це, якщо Ви не знаєте, що Ви " "збираєтеся зробити.\n" "\n" -"ПРИМІТКА: Ці налаштування будуть застосовані при наступному вході." +"ПРИМІТКА: Ці налаштування будуть застосовані при наступному логуванні." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "Додаткові опції" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" -msgstr "Програми, які запускаються після входу:" +msgstr "Програми, які запускаються при запуску стільниці:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "Програми, які запускаються автоматично" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" msgstr "" "Командний рядок для запуску менеджера вікон\n" -"(Командою по замовчуванню для менеджера вікон LXDE повинна бути openbox-lxde)" +"(Командою по замовчуванню для менеджера вікон LXDE повниина бути openbox-" +"lxde)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" -msgstr "Налаштування сесії робочого столу" +msgstr "Налаштування сесії по замовчуванню" -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" -msgstr "Менеджер вікон:" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Керувати запущеними під час сесії програмами" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " +msgstr "Менеджер вікон: " diff -Nru lxsession-edit-0.2.0/po/ur.po lxsession-edit-0.2.0~svn20090913/po/ur.po --- lxsession-edit-0.2.0/po/ur.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/ur.po 2009-09-05 21:29:07.000000000 +0000 @@ -7,11 +7,10 @@ msgstr "" "Project-Id-Version: lxsession-edit\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" "PO-Revision-Date: 2009-05-10 03:42+0500\n" "Last-Translator: Muhammad Ali Makki \n" "Language-Team: Urdu \n" -"Language: ur\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -20,43 +19,41 @@ "X-Poedit-Country: PAKISTAN\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "فعال" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "اطلاقیہ" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "تبصرہ" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" +"Warning: Do NOT touch this unless you know exactly what you are doing.\n" "\n" "NOTE: This setting will take effect on next login." msgstr "" -"انتباہ: انہیں مت چھیڑیںجب تک کہ آپ کو پختہ طور پر یہ معلوم نہ " -"ہو کہ آپ کیا کرنے جارہے ہیں.\n" +"انتباہ: انہیں مت چھیڑیںجب تک کہ آپ کو پختہ طور پر یہ معلوم نہ ہو کہ آپ کیا کرنے جارہے ہیں.\n" "\n" "نوٹ: ان تبدیلیوں کا اطلاق اگلی بار لاگ ان پر ہوگا." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "اعلی اختیارات" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "اطلاقیے جو ڈیسک ٹاپ میں داخل ہوتے ہیں خودکار طور پر چل جائیں گے:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "خودکار چلنے والے اطلاقیے" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" @@ -64,15 +61,11 @@ "ونڈو منیجر کو چلانے کے لیے استعمال ہونے والی کمانڈ لائن\n" "(طے شدہ ونڈو منیجر کی کمانڈ برائے ایل ایکس ڈی ای openbox-lxde ہونی چاہیے)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "ڈیسک ٹاپ نشست ترتیبات" -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "ونڈو منیجر:" -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "" diff -Nru lxsession-edit-0.2.0/po/ur_PK.po lxsession-edit-0.2.0~svn20090913/po/ur_PK.po --- lxsession-edit-0.2.0/po/ur_PK.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/ur_PK.po 2009-09-05 21:29:07.000000000 +0000 @@ -7,11 +7,10 @@ msgstr "" "Project-Id-Version: lxsession-edit\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" "PO-Revision-Date: 2009-05-10 03:42+0500\n" "Last-Translator: Muhammad Ali Makki \n" "Language-Team: Urdu \n" -"Language: ur\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -20,43 +19,41 @@ "X-Poedit-Country: PAKISTAN\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "فعال" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "اطلاقیہ" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "تبصرہ" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" -"Warning: Do NOT touch this unless you know exactly what you " -"are doing.\n" +"Warning: Do NOT touch this unless you know exactly what you are doing.\n" "\n" "NOTE: This setting will take effect on next login." msgstr "" -"انتباہ: انہیں مت چھیڑیںجب تک کہ آپ کو پختہ طور پر یہ معلوم نہ " -"ہو کہ آپ کیا کرنے جارہے ہیں.\n" +"انتباہ: انہیں مت چھیڑیںجب تک کہ آپ کو پختہ طور پر یہ معلوم نہ ہو کہ آپ کیا کرنے جارہے ہیں.\n" "\n" "نوٹ: ان تبدیلیوں کا اطلاق اگلی بار لاگ ان پر ہوگا." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "اعلی اختیارات" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" msgstr "اطلاقیے جو ڈیسک ٹاپ میں داخل ہوتے ہیں خودکار طور پر چل جائیں گے:" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "خودکار چلنے والے اطلاقیے" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" @@ -64,15 +61,11 @@ "ونڈو منیجر کو چلانے کے لیے استعمال ہونے والی کمانڈ لائن\n" "(طے شدہ ونڈو منیجر کی کمانڈ برائے ایل ایکس ڈی ای openbox-lxde ہونی چاہیے)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "ڈیسک ٹاپ نشست ترتیبات" -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "ونڈو منیجر:" -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "" diff -Nru lxsession-edit-0.2.0/po/vi.po lxsession-edit-0.2.0~svn20090913/po/vi.po --- lxsession-edit-0.2.0/po/vi.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/vi.po 2009-09-05 21:29:07.000000000 +0000 @@ -3,73 +3,61 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2011-07-09 17:03+0200\n" -"Last-Translator: Duy Hung \n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.5\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" -msgstr "Thiết lập" +msgstr "" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" -msgstr "Ứng dụng" +msgstr "" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" -msgstr "Chú thích" +msgstr "" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" "\n" "NOTE: This setting will take effect on next login." msgstr "" -"Cảnh báo: Không sửa chỗ này trừ khi bạn biết chính xác bạn " -"đang làm gì.\n" -"\n" -"CHÚ Ý: Thiếp lập này sẽ có hiệu lực trong lần đăng nhập tới." -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" -msgstr "Tùy chọn Nâng cao" +msgstr "" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" -msgstr "Ứng dụng tự khởi chạy sau khi đăng nhập: " +msgstr "" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" -msgstr "Ứng dụng tự khởi chạy" +msgstr "" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" msgstr "" -"Dòng lệnh được sử dụng để chạy chương trình quản lý cửa sổ\n" -"(lệnh của chương trình quản lý cửa sổ mặc định cho LXDE là openbox-lxde)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" -msgstr "Thiết lập phiên làm việc" +msgstr "" -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" -msgstr "Chương trình quản lý cửa sổ:" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "Quản lý các ứng dụng được chạy trong phiên làm việc" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " +msgstr "" diff -Nru lxsession-edit-0.2.0/po/zh_CN.po lxsession-edit-0.2.0~svn20090913/po/zh_CN.po --- lxsession-edit-0.2.0/po/zh_CN.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/zh_CN.po 2009-09-05 21:29:07.000000000 +0000 @@ -1,74 +1,63 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Funda Wang , 2009. +# FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: lxsession-edit 0.2.0\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" -"PO-Revision-Date: 2011-06-19 13:14+0200\n" -"Last-Translator: Yinghua_Wang \n" -"Language-Team: Funda Wang \n" -"Language: zh_CN\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.5\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" -msgstr "启用" +msgstr "" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" -msgstr "应用程序" +msgstr "" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" -msgstr "注释" +msgstr "" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" "\n" "NOTE: This setting will take effect on next login." msgstr "" -"警告：除非您完全了解此程序的功能，否则请不要使用此工具。\n" -"\n" -"注意：此设置将会在下次登录时生效。" -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" -msgstr "高级选项" +msgstr "" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 msgid "Applications automatically started after entering desktop:" -msgstr "进入桌面后自动启动的应用程序：" +msgstr "" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" -msgstr "自动启动的应用程序" +msgstr "" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" msgstr "" -"用于启动窗口管理器的命令行\n" -"(LXDE 默认的窗口管理器命令应该是 openbox-lxde)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" -msgstr "桌面会话设置" +msgstr "" -#: ../data/lxsession-edit.ui.h:10 -msgid "Window Manager:" -msgstr "窗口管理器：" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "管理在桌面会话中装入的应用程序" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " +msgstr "" diff -Nru lxsession-edit-0.2.0/po/zh_TW.po lxsession-edit-0.2.0~svn20090913/po/zh_TW.po --- lxsession-edit-0.2.0/po/zh_TW.po 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/po/zh_TW.po 2009-09-05 21:29:07.000000000 +0000 @@ -7,30 +7,29 @@ msgstr "" "Project-Id-Version: lxsession-edit 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-16 21:40+0200\n" +"POT-Creation-Date: 2009-04-15 19:47+0200\n" "PO-Revision-Date: 2008-12-02 16:38+0800\n" "Last-Translator: \n" "Language-Team: zh_TW \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Chinese\n" "X-Poedit-Country: TAIWAN\n" -#: ../src/lxsession-edit.c:362 +#: ../src/lxsession-edit.c:360 msgid "Enabled" msgstr "啟用" -#: ../src/lxsession-edit.c:367 +#: ../src/lxsession-edit.c:365 msgid "Application" msgstr "應用程式" -#: ../src/lxsession-edit.c:375 +#: ../src/lxsession-edit.c:373 msgid "Comment" msgstr "說明" -#: ../data/lxsession-edit.ui.h:1 +#: ../data/lxsession-edit.glade.h:1 msgid "" "Warning: Do NOT touch this unless you know exactly what you " "are doing.\n" @@ -41,20 +40,20 @@ "\n" "注意：這項設定在下次登入的時候才會作用。" -#: ../data/lxsession-edit.ui.h:4 +#: ../data/lxsession-edit.glade.h:4 msgid "Advanced Options" msgstr "進階選項" -#: ../data/lxsession-edit.ui.h:5 +#: ../data/lxsession-edit.glade.h:5 #, fuzzy msgid "Applications automatically started after entering desktop:" msgstr "在進入桌面後自動啟動的應用程式：" -#: ../data/lxsession-edit.ui.h:6 +#: ../data/lxsession-edit.glade.h:6 msgid "Automatically Started Applications" msgstr "自動啟動程式" -#: ../data/lxsession-edit.ui.h:7 +#: ../data/lxsession-edit.glade.h:7 msgid "" "Command line used to launch window manager\n" "(The default window manager command for LXDE should be openbox-lxde)" @@ -62,15 +61,10 @@ "用來啟動視窗管理程式的命令列\n" "(LXDE 下預設的視窗管理程式命令應設為 openbox-lxde)" -#: ../data/lxsession-edit.ui.h:9 ../lxsession-edit.desktop.in.h:1 +#: ../data/lxsession-edit.glade.h:9 msgid "Desktop Session Settings" msgstr "桌面工作階段設定" -#: ../data/lxsession-edit.ui.h:10 -#, fuzzy -msgid "Window Manager:" +#: ../data/lxsession-edit.glade.h:10 +msgid "Window Manager: " msgstr "視窗管理程式：" - -#: ../lxsession-edit.desktop.in.h:2 -msgid "Manage applications loaded in desktop session" -msgstr "管理桌面工作階段中載入的程式" diff -Nru lxsession-edit-0.2.0/src/Makefile.am lxsession-edit-0.2.0~svn20090913/src/Makefile.am --- lxsession-edit-0.2.0/src/Makefile.am 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/src/Makefile.am 2009-09-05 21:29:06.000000000 +0000 @@ -4,7 +4,6 @@ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ @GTK_CFLAGS@ - @ADDITIONAL_FLAGS@ bin_PROGRAMS = lxsession-edit diff -Nru lxsession-edit-0.2.0/src/Makefile.in lxsession-edit-0.2.0~svn20090913/src/Makefile.in --- lxsession-edit-0.2.0/src/Makefile.in 2011-07-19 20:18:17.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/src/Makefile.in 2009-09-13 11:06:52.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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. @@ -17,9 +16,8 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -43,8 +41,8 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am_lxsession_edit_OBJECTS = lxsession-edit.$(OBJEXT) lxsession_edit_OBJECTS = $(am_lxsession_edit_OBJECTS) @@ -58,36 +56,18 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles -am__mv = mv -f -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) -am__v_lt_0 = --silent COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(lxsession_edit_SOURCES) $(xml_purge_SOURCES) DIST_SOURCES = $(lxsession_edit_SOURCES) $(xml_purge_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ADDITIONAL_FLAGS = @ADDITIONAL_FLAGS@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -112,6 +92,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INSTALL = @INSTALL@ @@ -142,12 +123,9 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -225,9 +203,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -245,41 +223,26 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p; \ - then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + else :; fi; \ + done uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) @@ -288,10 +251,10 @@ -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) lxsession-edit$(EXEEXT): $(lxsession_edit_OBJECTS) $(lxsession_edit_DEPENDENCIES) @rm -f lxsession-edit$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(lxsession_edit_OBJECTS) $(lxsession_edit_LDADD) $(LIBS) + $(LINK) $(lxsession_edit_OBJECTS) $(lxsession_edit_LDADD) $(LIBS) xml-purge$(EXEEXT): $(xml_purge_OBJECTS) $(xml_purge_DEPENDENCIES) @rm -f xml-purge$(EXEEXT) - $(AM_V_CCLD)$(xml_purge_LINK) $(xml_purge_OBJECTS) $(xml_purge_LDADD) $(LIBS) + $(xml_purge_LINK) $(xml_purge_OBJECTS) $(xml_purge_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -303,33 +266,29 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml_purge-xml-purge.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` xml_purge-xml-purge.o: xml-purge.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.o -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xml_purge-xml-purge.Tpo $(DEPDIR)/xml_purge-xml-purge.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.o -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xml_purge-xml-purge.Tpo $(DEPDIR)/xml_purge-xml-purge.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xml-purge.c' object='xml_purge-xml-purge.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c xml_purge-xml-purge.obj: xml-purge.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.obj -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.obj `if test -f 'xml-purge.c'; then $(CYGPATH_W) 'xml-purge.c'; else $(CYGPATH_W) '$(srcdir)/xml-purge.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xml_purge-xml-purge.Tpo $(DEPDIR)/xml_purge-xml-purge.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.obj -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.obj `if test -f 'xml-purge.c'; then $(CYGPATH_W) 'xml-purge.c'; else $(CYGPATH_W) '$(srcdir)/xml-purge.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xml_purge-xml-purge.Tpo $(DEPDIR)/xml_purge-xml-purge.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xml-purge.c' object='xml_purge-xml-purge.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -c -o xml_purge-xml-purge.obj `if test -f 'xml-purge.c'; then $(CYGPATH_W) 'xml-purge.c'; else $(CYGPATH_W) '$(srcdir)/xml-purge.c'; fi` @@ -346,7 +305,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - set x; \ + tags=; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -354,34 +313,29 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) + tags=; \ 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; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique + $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -402,17 +356,13 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ || exit 1; \ fi; \ done @@ -443,7 +393,6 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -465,8 +414,6 @@ html: html-am -html-am: - info: info-am info-am: @@ -475,28 +422,18 @@ install-dvi: install-dvi-am -install-dvi-am: - install-exec-am: install-binPROGRAMS install-html: install-html-am -install-html-am: - install-info: install-info-am -install-info-am: - install-man: install-pdf: install-pdf-am -install-pdf-am: - install-ps: install-ps-am -install-ps-am: - installcheck-am: maintainer-clean: maintainer-clean-am @@ -533,8 +470,6 @@ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-binPROGRAMS - @ADDITIONAL_FLAGS@ - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru lxsession-edit-0.2.0/src/lxsession-edit.c lxsession-edit-0.2.0~svn20090913/src/lxsession-edit.c --- lxsession-edit-0.2.0/src/lxsession-edit.c 2011-07-19 20:17:57.000000000 +0000 +++ lxsession-edit-0.2.0~svn20090913/src/lxsession-edit.c 2009-09-05 21:29:06.000000000 +0000 @@ -97,7 +97,7 @@ if( g_key_file_get_boolean(kf, grp, "Hidden", NULL) ) return FALSE; - if( (tmp = g_key_file_get_string(kf, grp, "Type", NULL)) != NULL ) + if( tmp = g_key_file_get_string(kf, grp, "Type", NULL) ) { if( strcmp(tmp, "Application") ) { @@ -107,7 +107,7 @@ g_free(tmp); } - if( (tmp = g_key_file_get_string(kf, grp, "TryExec", NULL)) != NULL ) + if( tmp = g_key_file_get_string(kf, grp, "TryExec", NULL) ) { char* prg = g_find_program_in_path(tmp); g_free(tmp); @@ -223,7 +223,7 @@ list[n] = NULL; } if( n > 0 ) - g_key_file_set_string_list( kf, grp, "NotShowIn", (const gchar * const *) list, n ); + g_key_file_set_string_list( kf, grp, "NotShowIn", list, n ); else g_key_file_remove_key(kf, grp, "NotShowIn", NULL); g_strfreev(list); @@ -231,7 +231,7 @@ else if( flags & ONLY_SHOW_IN ) { gsize n, i; - char * * list = g_key_file_get_string_list(kf, grp, "OnlyShowIn", &n, NULL); + char** list = g_key_file_get_string_list(kf, grp, "OnlyShowIn", &n, NULL); if( enabled ) /* add our DE to OnlyShowIn */ { ++n; @@ -256,7 +256,7 @@ } } if( n > 0 ) - g_key_file_set_string_list(kf, grp, "OnlyShowIn", (const gchar * const *) list, n ); + g_key_file_set_string_list(kf, grp, "OnlyShowIn", list, n ); else g_key_file_remove_key(kf, grp, "OnlyShowIn", NULL); g_strfreev(list); @@ -265,10 +265,10 @@ { if( !enabled ) { - char* list[2]; - list[0] = (char *) session_name; + char** list[2]; + list[0] = session_name; list[1] = NULL; - g_key_file_set_string_list( kf, grp, "NotShowIn", (const gchar * const *) list, 1); + g_key_file_set_string_list( kf, grp, "NotShowIn", list, 1); } else { @@ -282,7 +282,7 @@ GtkTreeIter it; GKeyFile* kf; char* dirname; - if( ! gtk_tree_model_get_iter_first(GTK_TREE_MODEL(autostart_list), &it) ) + if( ! gtk_tree_model_get_iter_first(autostart_list, &it) ) return; /* create user autostart dir */ @@ -296,7 +296,7 @@ { int flags; gboolean enabled; - gtk_tree_model_get( GTK_TREE_MODEL(autostart_list), &it, + gtk_tree_model_get( autostart_list, &it, COL_ENABLED, &enabled, COL_FLAGS, &flags, -1); @@ -304,7 +304,7 @@ if( enabled != !!(flags & ORIGINALLY_ENABLED) ) { char* desktop_id, *src_file; - gtk_tree_model_get( GTK_TREE_MODEL(autostart_list), &it, + gtk_tree_model_get( autostart_list, &it, COL_DESKTOP_ID, &desktop_id, COL_SRC_FILE, &src_file, -1); @@ -327,7 +327,7 @@ g_free(desktop_id); g_free(src_file); } - }while( gtk_tree_model_iter_next(GTK_TREE_MODEL(autostart_list), &it) ); + }while( gtk_tree_model_iter_next(autostart_list, &it) ); g_key_file_free(kf); } @@ -336,10 +336,10 @@ { GtkTreePath* tp = gtk_tree_path_new_from_string(tp_str); GtkTreeIter it; - if( gtk_tree_model_get_iter(GTK_TREE_MODEL(autostart_list), &it, tp) ) + if( gtk_tree_model_get_iter(autostart_list, &it, tp) ) { gboolean enabled; - gtk_tree_model_get(GTK_TREE_MODEL(autostart_list), &it, COL_ENABLED, &enabled, -1 ); + gtk_tree_model_get(autostart_list, &it, COL_ENABLED, &enabled, -1 ); gtk_list_store_set(autostart_list, &it, COL_ENABLED, !enabled, -1 ); } gtk_tree_path_free(tp); @@ -394,7 +394,7 @@ if( argc > 1 ) session_name = argv[1]; else - session_name = g_getenv("XDG_CURRENT_DESKTOP"); + session_name = g_getenv("DESKTOP_SESSION"); if( G_UNLIKELY(!session_name) ) session_name = "LXDE"; @@ -411,9 +411,6 @@ gtk_dialog_set_alternative_button_order((GtkDialog*)dlg, GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1); - /* Set icon name for main (dlg) window so it displays in the panel. */ - gtk_window_set_icon_name(GTK_WINDOW(dlg), "xfwm4"); - /* autostart list */ init_list_view((GtkTreeView*)autostarts); load_autostart();