Merge lp:~fginther/evemu/evemu-oneiric-rename into lp:evemu/oneiric
- evemu-oneiric-rename
- Merge into oneiric
Status: | Merged |
---|---|
Approved by: | Daniel d'Andrada |
Approved revision: | 17 |
Merged at revision: | 15 |
Proposed branch: | lp:~fginther/evemu/evemu-oneiric-rename |
Merge into: | lp:evemu/oneiric |
Diff against target: |
24155 lines (+6949/-6051) 43 files modified
COPYING (+0/-676) ChangeLog (+7/-9) INSTALL (+0/-38) Makefile.am (+0/-14) Makefile.in (+96/-46) README (+0/-32) aclocal.m4 (+1532/-872) config-aux/config.guess (+146/-118) config-aux/config.sub (+143/-75) config-aux/depcomp (+134/-56) config-aux/ltmain.sh (+2657/-1409) config-aux/missing (+4/-49) configure (+2017/-1132) configure.ac (+0/-40) debian/changelog (+13/-32) debian/control (+16/-10) debian/copyright (+2/-2) debian/libevemu-dev.install (+1/-1) debian/libevemu1-udeb.install (+1/-1) debian/libevemu1.install (+1/-1) debian/libevemu1.symbols (+1/-1) debian/patches/01-fix-so-link-within-manual-page (+14/-0) debian/patches/series (+1/-0) debian/rules (+1/-1) debian/watch (+1/-1) evemu.pc.in (+9/-0) include/evemu.h (+0/-316) src/Makefile.am (+0/-15) src/Makefile.in (+78/-41) src/evemu-impl.h (+0/-37) src/evemu.c (+0/-503) tools/Makefile.am (+0/-35) tools/Makefile.in (+66/-23) tools/evemu-describe.1 (+3/-3) tools/evemu-describe.c (+0/-84) tools/evemu-device.1 (+3/-3) tools/evemu-device.c (+0/-135) tools/evemu-echo.c (+0/-93) tools/evemu-play.1 (+1/-1) tools/evemu-play.c (+0/-68) tools/evemu-record.1 (+1/-1) tools/evemu-record.c (+0/-68) utouch-evemu.pc.in (+0/-9) |
To merge this branch: | bzr merge lp:~fginther/evemu/evemu-oneiric-rename |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel d'Andrada (community) | Approve | ||
Review via email: mp+120468@code.launchpad.net |
Commit message
* New upstream microrelease, bug fixes only
- Rename project to simply 'evemu' (LP: #1039100)
* Updated debian/watch file for project rename
* Rename package and update packaging
- Added Conflicts and Replaces clauses for libevemu-dev, evemu-tools and
libevemu1
* Updated Standards-Version to 3.9.2 in debian/control
* Added patches/
Description of the change
The primary rationale for this change is to repackage evemu for the project rename.
* New upstream microrelease, bug fixes only
- Rename project to simply 'evemu' (LP: #1039100)
* Updated debian/watch file for project rename
* Rename package and update packaging
- Added Conflicts and Replaces clauses for libevemu-dev, evemu-tools and
libevemu1
* Updated Standards-Version to 3.9.2 in debian/control
* Added patches/
Preview Diff
1 | === added file 'COPYING' |
2 | --- COPYING 1970-01-01 00:00:00 +0000 |
3 | +++ COPYING 2012-08-20 20:53:20 +0000 |
4 | @@ -0,0 +1,676 @@ |
5 | + |
6 | + GNU GENERAL PUBLIC LICENSE |
7 | + Version 3, 29 June 2007 |
8 | + |
9 | + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> |
10 | + Everyone is permitted to copy and distribute verbatim copies |
11 | + of this license document, but changing it is not allowed. |
12 | + |
13 | + Preamble |
14 | + |
15 | + The GNU General Public License is a free, copyleft license for |
16 | +software and other kinds of works. |
17 | + |
18 | + The licenses for most software and other practical works are designed |
19 | +to take away your freedom to share and change the works. By contrast, |
20 | +the GNU General Public License is intended to guarantee your freedom to |
21 | +share and change all versions of a program--to make sure it remains free |
22 | +software for all its users. We, the Free Software Foundation, use the |
23 | +GNU General Public License for most of our software; it applies also to |
24 | +any other work released this way by its authors. You can apply it to |
25 | +your programs, too. |
26 | + |
27 | + When we speak of free software, we are referring to freedom, not |
28 | +price. Our General Public Licenses are designed to make sure that you |
29 | +have the freedom to distribute copies of free software (and charge for |
30 | +them if you wish), that you receive source code or can get it if you |
31 | +want it, that you can change the software or use pieces of it in new |
32 | +free programs, and that you know you can do these things. |
33 | + |
34 | + To protect your rights, we need to prevent others from denying you |
35 | +these rights or asking you to surrender the rights. Therefore, you have |
36 | +certain responsibilities if you distribute copies of the software, or if |
37 | +you modify it: responsibilities to respect the freedom of others. |
38 | + |
39 | + For example, if you distribute copies of such a program, whether |
40 | +gratis or for a fee, you must pass on to the recipients the same |
41 | +freedoms that you received. You must make sure that they, too, receive |
42 | +or can get the source code. And you must show them these terms so they |
43 | +know their rights. |
44 | + |
45 | + Developers that use the GNU GPL protect your rights with two steps: |
46 | +(1) assert copyright on the software, and (2) offer you this License |
47 | +giving you legal permission to copy, distribute and/or modify it. |
48 | + |
49 | + For the developers' and authors' protection, the GPL clearly explains |
50 | +that there is no warranty for this free software. For both users' and |
51 | +authors' sake, the GPL requires that modified versions be marked as |
52 | +changed, so that their problems will not be attributed erroneously to |
53 | +authors of previous versions. |
54 | + |
55 | + Some devices are designed to deny users access to install or run |
56 | +modified versions of the software inside them, although the manufacturer |
57 | +can do so. This is fundamentally incompatible with the aim of |
58 | +protecting users' freedom to change the software. The systematic |
59 | +pattern of such abuse occurs in the area of products for individuals to |
60 | +use, which is precisely where it is most unacceptable. Therefore, we |
61 | +have designed this version of the GPL to prohibit the practice for those |
62 | +products. If such problems arise substantially in other domains, we |
63 | +stand ready to extend this provision to those domains in future versions |
64 | +of the GPL, as needed to protect the freedom of users. |
65 | + |
66 | + Finally, every program is threatened constantly by software patents. |
67 | +States should not allow patents to restrict development and use of |
68 | +software on general-purpose computers, but in those that do, we wish to |
69 | +avoid the special danger that patents applied to a free program could |
70 | +make it effectively proprietary. To prevent this, the GPL assures that |
71 | +patents cannot be used to render the program non-free. |
72 | + |
73 | + The precise terms and conditions for copying, distribution and |
74 | +modification follow. |
75 | + |
76 | + TERMS AND CONDITIONS |
77 | + |
78 | + 0. Definitions. |
79 | + |
80 | + "This License" refers to version 3 of the GNU General Public License. |
81 | + |
82 | + "Copyright" also means copyright-like laws that apply to other kinds of |
83 | +works, such as semiconductor masks. |
84 | + |
85 | + "The Program" refers to any copyrightable work licensed under this |
86 | +License. Each licensee is addressed as "you". "Licensees" and |
87 | +"recipients" may be individuals or organizations. |
88 | + |
89 | + To "modify" a work means to copy from or adapt all or part of the work |
90 | +in a fashion requiring copyright permission, other than the making of an |
91 | +exact copy. The resulting work is called a "modified version" of the |
92 | +earlier work or a work "based on" the earlier work. |
93 | + |
94 | + A "covered work" means either the unmodified Program or a work based |
95 | +on the Program. |
96 | + |
97 | + To "propagate" a work means to do anything with it that, without |
98 | +permission, would make you directly or secondarily liable for |
99 | +infringement under applicable copyright law, except executing it on a |
100 | +computer or modifying a private copy. Propagation includes copying, |
101 | +distribution (with or without modification), making available to the |
102 | +public, and in some countries other activities as well. |
103 | + |
104 | + To "convey" a work means any kind of propagation that enables other |
105 | +parties to make or receive copies. Mere interaction with a user through |
106 | +a computer network, with no transfer of a copy, is not conveying. |
107 | + |
108 | + An interactive user interface displays "Appropriate Legal Notices" |
109 | +to the extent that it includes a convenient and prominently visible |
110 | +feature that (1) displays an appropriate copyright notice, and (2) |
111 | +tells the user that there is no warranty for the work (except to the |
112 | +extent that warranties are provided), that licensees may convey the |
113 | +work under this License, and how to view a copy of this License. If |
114 | +the interface presents a list of user commands or options, such as a |
115 | +menu, a prominent item in the list meets this criterion. |
116 | + |
117 | + 1. Source Code. |
118 | + |
119 | + The "source code" for a work means the preferred form of the work |
120 | +for making modifications to it. "Object code" means any non-source |
121 | +form of a work. |
122 | + |
123 | + A "Standard Interface" means an interface that either is an official |
124 | +standard defined by a recognized standards body, or, in the case of |
125 | +interfaces specified for a particular programming language, one that |
126 | +is widely used among developers working in that language. |
127 | + |
128 | + The "System Libraries" of an executable work include anything, other |
129 | +than the work as a whole, that (a) is included in the normal form of |
130 | +packaging a Major Component, but which is not part of that Major |
131 | +Component, and (b) serves only to enable use of the work with that |
132 | +Major Component, or to implement a Standard Interface for which an |
133 | +implementation is available to the public in source code form. A |
134 | +"Major Component", in this context, means a major essential component |
135 | +(kernel, window system, and so on) of the specific operating system |
136 | +(if any) on which the executable work runs, or a compiler used to |
137 | +produce the work, or an object code interpreter used to run it. |
138 | + |
139 | + The "Corresponding Source" for a work in object code form means all |
140 | +the source code needed to generate, install, and (for an executable |
141 | +work) run the object code and to modify the work, including scripts to |
142 | +control those activities. However, it does not include the work's |
143 | +System Libraries, or general-purpose tools or generally available free |
144 | +programs which are used unmodified in performing those activities but |
145 | +which are not part of the work. For example, Corresponding Source |
146 | +includes interface definition files associated with source files for |
147 | +the work, and the source code for shared libraries and dynamically |
148 | +linked subprograms that the work is specifically designed to require, |
149 | +such as by intimate data communication or control flow between those |
150 | +subprograms and other parts of the work. |
151 | + |
152 | + The Corresponding Source need not include anything that users |
153 | +can regenerate automatically from other parts of the Corresponding |
154 | +Source. |
155 | + |
156 | + The Corresponding Source for a work in source code form is that |
157 | +same work. |
158 | + |
159 | + 2. Basic Permissions. |
160 | + |
161 | + All rights granted under this License are granted for the term of |
162 | +copyright on the Program, and are irrevocable provided the stated |
163 | +conditions are met. This License explicitly affirms your unlimited |
164 | +permission to run the unmodified Program. The output from running a |
165 | +covered work is covered by this License only if the output, given its |
166 | +content, constitutes a covered work. This License acknowledges your |
167 | +rights of fair use or other equivalent, as provided by copyright law. |
168 | + |
169 | + You may make, run and propagate covered works that you do not |
170 | +convey, without conditions so long as your license otherwise remains |
171 | +in force. You may convey covered works to others for the sole purpose |
172 | +of having them make modifications exclusively for you, or provide you |
173 | +with facilities for running those works, provided that you comply with |
174 | +the terms of this License in conveying all material for which you do |
175 | +not control copyright. Those thus making or running the covered works |
176 | +for you must do so exclusively on your behalf, under your direction |
177 | +and control, on terms that prohibit them from making any copies of |
178 | +your copyrighted material outside their relationship with you. |
179 | + |
180 | + Conveying under any other circumstances is permitted solely under |
181 | +the conditions stated below. Sublicensing is not allowed; section 10 |
182 | +makes it unnecessary. |
183 | + |
184 | + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. |
185 | + |
186 | + No covered work shall be deemed part of an effective technological |
187 | +measure under any applicable law fulfilling obligations under article |
188 | +11 of the WIPO copyright treaty adopted on 20 December 1996, or |
189 | +similar laws prohibiting or restricting circumvention of such |
190 | +measures. |
191 | + |
192 | + When you convey a covered work, you waive any legal power to forbid |
193 | +circumvention of technological measures to the extent such circumvention |
194 | +is effected by exercising rights under this License with respect to |
195 | +the covered work, and you disclaim any intention to limit operation or |
196 | +modification of the work as a means of enforcing, against the work's |
197 | +users, your or third parties' legal rights to forbid circumvention of |
198 | +technological measures. |
199 | + |
200 | + 4. Conveying Verbatim Copies. |
201 | + |
202 | + You may convey verbatim copies of the Program's source code as you |
203 | +receive it, in any medium, provided that you conspicuously and |
204 | +appropriately publish on each copy an appropriate copyright notice; |
205 | +keep intact all notices stating that this License and any |
206 | +non-permissive terms added in accord with section 7 apply to the code; |
207 | +keep intact all notices of the absence of any warranty; and give all |
208 | +recipients a copy of this License along with the Program. |
209 | + |
210 | + You may charge any price or no price for each copy that you convey, |
211 | +and you may offer support or warranty protection for a fee. |
212 | + |
213 | + 5. Conveying Modified Source Versions. |
214 | + |
215 | + You may convey a work based on the Program, or the modifications to |
216 | +produce it from the Program, in the form of source code under the |
217 | +terms of section 4, provided that you also meet all of these conditions: |
218 | + |
219 | + a) The work must carry prominent notices stating that you modified |
220 | + it, and giving a relevant date. |
221 | + |
222 | + b) The work must carry prominent notices stating that it is |
223 | + released under this License and any conditions added under section |
224 | + 7. This requirement modifies the requirement in section 4 to |
225 | + "keep intact all notices". |
226 | + |
227 | + c) You must license the entire work, as a whole, under this |
228 | + License to anyone who comes into possession of a copy. This |
229 | + License will therefore apply, along with any applicable section 7 |
230 | + additional terms, to the whole of the work, and all its parts, |
231 | + regardless of how they are packaged. This License gives no |
232 | + permission to license the work in any other way, but it does not |
233 | + invalidate such permission if you have separately received it. |
234 | + |
235 | + d) If the work has interactive user interfaces, each must display |
236 | + Appropriate Legal Notices; however, if the Program has interactive |
237 | + interfaces that do not display Appropriate Legal Notices, your |
238 | + work need not make them do so. |
239 | + |
240 | + A compilation of a covered work with other separate and independent |
241 | +works, which are not by their nature extensions of the covered work, |
242 | +and which are not combined with it such as to form a larger program, |
243 | +in or on a volume of a storage or distribution medium, is called an |
244 | +"aggregate" if the compilation and its resulting copyright are not |
245 | +used to limit the access or legal rights of the compilation's users |
246 | +beyond what the individual works permit. Inclusion of a covered work |
247 | +in an aggregate does not cause this License to apply to the other |
248 | +parts of the aggregate. |
249 | + |
250 | + 6. Conveying Non-Source Forms. |
251 | + |
252 | + You may convey a covered work in object code form under the terms |
253 | +of sections 4 and 5, provided that you also convey the |
254 | +machine-readable Corresponding Source under the terms of this License, |
255 | +in one of these ways: |
256 | + |
257 | + a) Convey the object code in, or embodied in, a physical product |
258 | + (including a physical distribution medium), accompanied by the |
259 | + Corresponding Source fixed on a durable physical medium |
260 | + customarily used for software interchange. |
261 | + |
262 | + b) Convey the object code in, or embodied in, a physical product |
263 | + (including a physical distribution medium), accompanied by a |
264 | + written offer, valid for at least three years and valid for as |
265 | + long as you offer spare parts or customer support for that product |
266 | + model, to give anyone who possesses the object code either (1) a |
267 | + copy of the Corresponding Source for all the software in the |
268 | + product that is covered by this License, on a durable physical |
269 | + medium customarily used for software interchange, for a price no |
270 | + more than your reasonable cost of physically performing this |
271 | + conveying of source, or (2) access to copy the |
272 | + Corresponding Source from a network server at no charge. |
273 | + |
274 | + c) Convey individual copies of the object code with a copy of the |
275 | + written offer to provide the Corresponding Source. This |
276 | + alternative is allowed only occasionally and noncommercially, and |
277 | + only if you received the object code with such an offer, in accord |
278 | + with subsection 6b. |
279 | + |
280 | + d) Convey the object code by offering access from a designated |
281 | + place (gratis or for a charge), and offer equivalent access to the |
282 | + Corresponding Source in the same way through the same place at no |
283 | + further charge. You need not require recipients to copy the |
284 | + Corresponding Source along with the object code. If the place to |
285 | + copy the object code is a network server, the Corresponding Source |
286 | + may be on a different server (operated by you or a third party) |
287 | + that supports equivalent copying facilities, provided you maintain |
288 | + clear directions next to the object code saying where to find the |
289 | + Corresponding Source. Regardless of what server hosts the |
290 | + Corresponding Source, you remain obligated to ensure that it is |
291 | + available for as long as needed to satisfy these requirements. |
292 | + |
293 | + e) Convey the object code using peer-to-peer transmission, provided |
294 | + you inform other peers where the object code and Corresponding |
295 | + Source of the work are being offered to the general public at no |
296 | + charge under subsection 6d. |
297 | + |
298 | + A separable portion of the object code, whose source code is excluded |
299 | +from the Corresponding Source as a System Library, need not be |
300 | +included in conveying the object code work. |
301 | + |
302 | + A "User Product" is either (1) a "consumer product", which means any |
303 | +tangible personal property which is normally used for personal, family, |
304 | +or household purposes, or (2) anything designed or sold for incorporation |
305 | +into a dwelling. In determining whether a product is a consumer product, |
306 | +doubtful cases shall be resolved in favor of coverage. For a particular |
307 | +product received by a particular user, "normally used" refers to a |
308 | +typical or common use of that class of product, regardless of the status |
309 | +of the particular user or of the way in which the particular user |
310 | +actually uses, or expects or is expected to use, the product. A product |
311 | +is a consumer product regardless of whether the product has substantial |
312 | +commercial, industrial or non-consumer uses, unless such uses represent |
313 | +the only significant mode of use of the product. |
314 | + |
315 | + "Installation Information" for a User Product means any methods, |
316 | +procedures, authorization keys, or other information required to install |
317 | +and execute modified versions of a covered work in that User Product from |
318 | +a modified version of its Corresponding Source. The information must |
319 | +suffice to ensure that the continued functioning of the modified object |
320 | +code is in no case prevented or interfered with solely because |
321 | +modification has been made. |
322 | + |
323 | + If you convey an object code work under this section in, or with, or |
324 | +specifically for use in, a User Product, and the conveying occurs as |
325 | +part of a transaction in which the right of possession and use of the |
326 | +User Product is transferred to the recipient in perpetuity or for a |
327 | +fixed term (regardless of how the transaction is characterized), the |
328 | +Corresponding Source conveyed under this section must be accompanied |
329 | +by the Installation Information. But this requirement does not apply |
330 | +if neither you nor any third party retains the ability to install |
331 | +modified object code on the User Product (for example, the work has |
332 | +been installed in ROM). |
333 | + |
334 | + The requirement to provide Installation Information does not include a |
335 | +requirement to continue to provide support service, warranty, or updates |
336 | +for a work that has been modified or installed by the recipient, or for |
337 | +the User Product in which it has been modified or installed. Access to a |
338 | +network may be denied when the modification itself materially and |
339 | +adversely affects the operation of the network or violates the rules and |
340 | +protocols for communication across the network. |
341 | + |
342 | + Corresponding Source conveyed, and Installation Information provided, |
343 | +in accord with this section must be in a format that is publicly |
344 | +documented (and with an implementation available to the public in |
345 | +source code form), and must require no special password or key for |
346 | +unpacking, reading or copying. |
347 | + |
348 | + 7. Additional Terms. |
349 | + |
350 | + "Additional permissions" are terms that supplement the terms of this |
351 | +License by making exceptions from one or more of its conditions. |
352 | +Additional permissions that are applicable to the entire Program shall |
353 | +be treated as though they were included in this License, to the extent |
354 | +that they are valid under applicable law. If additional permissions |
355 | +apply only to part of the Program, that part may be used separately |
356 | +under those permissions, but the entire Program remains governed by |
357 | +this License without regard to the additional permissions. |
358 | + |
359 | + When you convey a copy of a covered work, you may at your option |
360 | +remove any additional permissions from that copy, or from any part of |
361 | +it. (Additional permissions may be written to require their own |
362 | +removal in certain cases when you modify the work.) You may place |
363 | +additional permissions on material, added by you to a covered work, |
364 | +for which you have or can give appropriate copyright permission. |
365 | + |
366 | + Notwithstanding any other provision of this License, for material you |
367 | +add to a covered work, you may (if authorized by the copyright holders of |
368 | +that material) supplement the terms of this License with terms: |
369 | + |
370 | + a) Disclaiming warranty or limiting liability differently from the |
371 | + terms of sections 15 and 16 of this License; or |
372 | + |
373 | + b) Requiring preservation of specified reasonable legal notices or |
374 | + author attributions in that material or in the Appropriate Legal |
375 | + Notices displayed by works containing it; or |
376 | + |
377 | + c) Prohibiting misrepresentation of the origin of that material, or |
378 | + requiring that modified versions of such material be marked in |
379 | + reasonable ways as different from the original version; or |
380 | + |
381 | + d) Limiting the use for publicity purposes of names of licensors or |
382 | + authors of the material; or |
383 | + |
384 | + e) Declining to grant rights under trademark law for use of some |
385 | + trade names, trademarks, or service marks; or |
386 | + |
387 | + f) Requiring indemnification of licensors and authors of that |
388 | + material by anyone who conveys the material (or modified versions of |
389 | + it) with contractual assumptions of liability to the recipient, for |
390 | + any liability that these contractual assumptions directly impose on |
391 | + those licensors and authors. |
392 | + |
393 | + All other non-permissive additional terms are considered "further |
394 | +restrictions" within the meaning of section 10. If the Program as you |
395 | +received it, or any part of it, contains a notice stating that it is |
396 | +governed by this License along with a term that is a further |
397 | +restriction, you may remove that term. If a license document contains |
398 | +a further restriction but permits relicensing or conveying under this |
399 | +License, you may add to a covered work material governed by the terms |
400 | +of that license document, provided that the further restriction does |
401 | +not survive such relicensing or conveying. |
402 | + |
403 | + If you add terms to a covered work in accord with this section, you |
404 | +must place, in the relevant source files, a statement of the |
405 | +additional terms that apply to those files, or a notice indicating |
406 | +where to find the applicable terms. |
407 | + |
408 | + Additional terms, permissive or non-permissive, may be stated in the |
409 | +form of a separately written license, or stated as exceptions; |
410 | +the above requirements apply either way. |
411 | + |
412 | + 8. Termination. |
413 | + |
414 | + You may not propagate or modify a covered work except as expressly |
415 | +provided under this License. Any attempt otherwise to propagate or |
416 | +modify it is void, and will automatically terminate your rights under |
417 | +this License (including any patent licenses granted under the third |
418 | +paragraph of section 11). |
419 | + |
420 | + However, if you cease all violation of this License, then your |
421 | +license from a particular copyright holder is reinstated (a) |
422 | +provisionally, unless and until the copyright holder explicitly and |
423 | +finally terminates your license, and (b) permanently, if the copyright |
424 | +holder fails to notify you of the violation by some reasonable means |
425 | +prior to 60 days after the cessation. |
426 | + |
427 | + Moreover, your license from a particular copyright holder is |
428 | +reinstated permanently if the copyright holder notifies you of the |
429 | +violation by some reasonable means, this is the first time you have |
430 | +received notice of violation of this License (for any work) from that |
431 | +copyright holder, and you cure the violation prior to 30 days after |
432 | +your receipt of the notice. |
433 | + |
434 | + Termination of your rights under this section does not terminate the |
435 | +licenses of parties who have received copies or rights from you under |
436 | +this License. If your rights have been terminated and not permanently |
437 | +reinstated, you do not qualify to receive new licenses for the same |
438 | +material under section 10. |
439 | + |
440 | + 9. Acceptance Not Required for Having Copies. |
441 | + |
442 | + You are not required to accept this License in order to receive or |
443 | +run a copy of the Program. Ancillary propagation of a covered work |
444 | +occurring solely as a consequence of using peer-to-peer transmission |
445 | +to receive a copy likewise does not require acceptance. However, |
446 | +nothing other than this License grants you permission to propagate or |
447 | +modify any covered work. These actions infringe copyright if you do |
448 | +not accept this License. Therefore, by modifying or propagating a |
449 | +covered work, you indicate your acceptance of this License to do so. |
450 | + |
451 | + 10. Automatic Licensing of Downstream Recipients. |
452 | + |
453 | + Each time you convey a covered work, the recipient automatically |
454 | +receives a license from the original licensors, to run, modify and |
455 | +propagate that work, subject to this License. You are not responsible |
456 | +for enforcing compliance by third parties with this License. |
457 | + |
458 | + An "entity transaction" is a transaction transferring control of an |
459 | +organization, or substantially all assets of one, or subdividing an |
460 | +organization, or merging organizations. If propagation of a covered |
461 | +work results from an entity transaction, each party to that |
462 | +transaction who receives a copy of the work also receives whatever |
463 | +licenses to the work the party's predecessor in interest had or could |
464 | +give under the previous paragraph, plus a right to possession of the |
465 | +Corresponding Source of the work from the predecessor in interest, if |
466 | +the predecessor has it or can get it with reasonable efforts. |
467 | + |
468 | + You may not impose any further restrictions on the exercise of the |
469 | +rights granted or affirmed under this License. For example, you may |
470 | +not impose a license fee, royalty, or other charge for exercise of |
471 | +rights granted under this License, and you may not initiate litigation |
472 | +(including a cross-claim or counterclaim in a lawsuit) alleging that |
473 | +any patent claim is infringed by making, using, selling, offering for |
474 | +sale, or importing the Program or any portion of it. |
475 | + |
476 | + 11. Patents. |
477 | + |
478 | + A "contributor" is a copyright holder who authorizes use under this |
479 | +License of the Program or a work on which the Program is based. The |
480 | +work thus licensed is called the contributor's "contributor version". |
481 | + |
482 | + A contributor's "essential patent claims" are all patent claims |
483 | +owned or controlled by the contributor, whether already acquired or |
484 | +hereafter acquired, that would be infringed by some manner, permitted |
485 | +by this License, of making, using, or selling its contributor version, |
486 | +but do not include claims that would be infringed only as a |
487 | +consequence of further modification of the contributor version. For |
488 | +purposes of this definition, "control" includes the right to grant |
489 | +patent sublicenses in a manner consistent with the requirements of |
490 | +this License. |
491 | + |
492 | + Each contributor grants you a non-exclusive, worldwide, royalty-free |
493 | +patent license under the contributor's essential patent claims, to |
494 | +make, use, sell, offer for sale, import and otherwise run, modify and |
495 | +propagate the contents of its contributor version. |
496 | + |
497 | + In the following three paragraphs, a "patent license" is any express |
498 | +agreement or commitment, however denominated, not to enforce a patent |
499 | +(such as an express permission to practice a patent or covenant not to |
500 | +sue for patent infringement). To "grant" such a patent license to a |
501 | +party means to make such an agreement or commitment not to enforce a |
502 | +patent against the party. |
503 | + |
504 | + If you convey a covered work, knowingly relying on a patent license, |
505 | +and the Corresponding Source of the work is not available for anyone |
506 | +to copy, free of charge and under the terms of this License, through a |
507 | +publicly available network server or other readily accessible means, |
508 | +then you must either (1) cause the Corresponding Source to be so |
509 | +available, or (2) arrange to deprive yourself of the benefit of the |
510 | +patent license for this particular work, or (3) arrange, in a manner |
511 | +consistent with the requirements of this License, to extend the patent |
512 | +license to downstream recipients. "Knowingly relying" means you have |
513 | +actual knowledge that, but for the patent license, your conveying the |
514 | +covered work in a country, or your recipient's use of the covered work |
515 | +in a country, would infringe one or more identifiable patents in that |
516 | +country that you have reason to believe are valid. |
517 | + |
518 | + If, pursuant to or in connection with a single transaction or |
519 | +arrangement, you convey, or propagate by procuring conveyance of, a |
520 | +covered work, and grant a patent license to some of the parties |
521 | +receiving the covered work authorizing them to use, propagate, modify |
522 | +or convey a specific copy of the covered work, then the patent license |
523 | +you grant is automatically extended to all recipients of the covered |
524 | +work and works based on it. |
525 | + |
526 | + A patent license is "discriminatory" if it does not include within |
527 | +the scope of its coverage, prohibits the exercise of, or is |
528 | +conditioned on the non-exercise of one or more of the rights that are |
529 | +specifically granted under this License. You may not convey a covered |
530 | +work if you are a party to an arrangement with a third party that is |
531 | +in the business of distributing software, under which you make payment |
532 | +to the third party based on the extent of your activity of conveying |
533 | +the work, and under which the third party grants, to any of the |
534 | +parties who would receive the covered work from you, a discriminatory |
535 | +patent license (a) in connection with copies of the covered work |
536 | +conveyed by you (or copies made from those copies), or (b) primarily |
537 | +for and in connection with specific products or compilations that |
538 | +contain the covered work, unless you entered into that arrangement, |
539 | +or that patent license was granted, prior to 28 March 2007. |
540 | + |
541 | + Nothing in this License shall be construed as excluding or limiting |
542 | +any implied license or other defenses to infringement that may |
543 | +otherwise be available to you under applicable patent law. |
544 | + |
545 | + 12. No Surrender of Others' Freedom. |
546 | + |
547 | + If conditions are imposed on you (whether by court order, agreement or |
548 | +otherwise) that contradict the conditions of this License, they do not |
549 | +excuse you from the conditions of this License. If you cannot convey a |
550 | +covered work so as to satisfy simultaneously your obligations under this |
551 | +License and any other pertinent obligations, then as a consequence you may |
552 | +not convey it at all. For example, if you agree to terms that obligate you |
553 | +to collect a royalty for further conveying from those to whom you convey |
554 | +the Program, the only way you could satisfy both those terms and this |
555 | +License would be to refrain entirely from conveying the Program. |
556 | + |
557 | + 13. Use with the GNU Affero General Public License. |
558 | + |
559 | + Notwithstanding any other provision of this License, you have |
560 | +permission to link or combine any covered work with a work licensed |
561 | +under version 3 of the GNU Affero General Public License into a single |
562 | +combined work, and to convey the resulting work. The terms of this |
563 | +License will continue to apply to the part which is the covered work, |
564 | +but the special requirements of the GNU Affero General Public License, |
565 | +section 13, concerning interaction through a network will apply to the |
566 | +combination as such. |
567 | + |
568 | + 14. Revised Versions of this License. |
569 | + |
570 | + The Free Software Foundation may publish revised and/or new versions of |
571 | +the GNU General Public License from time to time. Such new versions will |
572 | +be similar in spirit to the present version, but may differ in detail to |
573 | +address new problems or concerns. |
574 | + |
575 | + Each version is given a distinguishing version number. If the |
576 | +Program specifies that a certain numbered version of the GNU General |
577 | +Public License "or any later version" applies to it, you have the |
578 | +option of following the terms and conditions either of that numbered |
579 | +version or of any later version published by the Free Software |
580 | +Foundation. If the Program does not specify a version number of the |
581 | +GNU General Public License, you may choose any version ever published |
582 | +by the Free Software Foundation. |
583 | + |
584 | + If the Program specifies that a proxy can decide which future |
585 | +versions of the GNU General Public License can be used, that proxy's |
586 | +public statement of acceptance of a version permanently authorizes you |
587 | +to choose that version for the Program. |
588 | + |
589 | + Later license versions may give you additional or different |
590 | +permissions. However, no additional obligations are imposed on any |
591 | +author or copyright holder as a result of your choosing to follow a |
592 | +later version. |
593 | + |
594 | + 15. Disclaimer of Warranty. |
595 | + |
596 | + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY |
597 | +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT |
598 | +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY |
599 | +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, |
600 | +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
601 | +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM |
602 | +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF |
603 | +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. |
604 | + |
605 | + 16. Limitation of Liability. |
606 | + |
607 | + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING |
608 | +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS |
609 | +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY |
610 | +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE |
611 | +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF |
612 | +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD |
613 | +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), |
614 | +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF |
615 | +SUCH DAMAGES. |
616 | + |
617 | + 17. Interpretation of Sections 15 and 16. |
618 | + |
619 | + If the disclaimer of warranty and limitation of liability provided |
620 | +above cannot be given local legal effect according to their terms, |
621 | +reviewing courts shall apply local law that most closely approximates |
622 | +an absolute waiver of all civil liability in connection with the |
623 | +Program, unless a warranty or assumption of liability accompanies a |
624 | +copy of the Program in return for a fee. |
625 | + |
626 | + END OF TERMS AND CONDITIONS |
627 | + |
628 | + How to Apply These Terms to Your New Programs |
629 | + |
630 | + If you develop a new program, and you want it to be of the greatest |
631 | +possible use to the public, the best way to achieve this is to make it |
632 | +free software which everyone can redistribute and change under these terms. |
633 | + |
634 | + To do so, attach the following notices to the program. It is safest |
635 | +to attach them to the start of each source file to most effectively |
636 | +state the exclusion of warranty; and each file should have at least |
637 | +the "copyright" line and a pointer to where the full notice is found. |
638 | + |
639 | + <one line to give the program's name and a brief idea of what it does.> |
640 | + Copyright (C) <year> <name of author> |
641 | + |
642 | + This program is free software: you can redistribute it and/or modify |
643 | + it under the terms of the GNU General Public License as published by |
644 | + the Free Software Foundation, either version 3 of the License, or |
645 | + (at your option) any later version. |
646 | + |
647 | + This program is distributed in the hope that it will be useful, |
648 | + but WITHOUT ANY WARRANTY; without even the implied warranty of |
649 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
650 | + GNU General Public License for more details. |
651 | + |
652 | + You should have received a copy of the GNU General Public License |
653 | + along with this program. If not, see <http://www.gnu.org/licenses/>. |
654 | + |
655 | +Also add information on how to contact you by electronic and paper mail. |
656 | + |
657 | + If the program does terminal interaction, make it output a short |
658 | +notice like this when it starts in an interactive mode: |
659 | + |
660 | + <program> Copyright (C) <year> <name of author> |
661 | + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. |
662 | + This is free software, and you are welcome to redistribute it |
663 | + under certain conditions; type `show c' for details. |
664 | + |
665 | +The hypothetical commands `show w' and `show c' should show the appropriate |
666 | +parts of the General Public License. Of course, your program's commands |
667 | +might be different; for a GUI interface, you would use an "about box". |
668 | + |
669 | + You should also get your employer (if you work as a programmer) or school, |
670 | +if any, to sign a "copyright disclaimer" for the program, if necessary. |
671 | +For more information on this, and how to apply and follow the GNU GPL, see |
672 | +<http://www.gnu.org/licenses/>. |
673 | + |
674 | + The GNU General Public License does not permit incorporating your program |
675 | +into proprietary programs. If your program is a subroutine library, you |
676 | +may consider it more useful to permit linking proprietary applications with |
677 | +the library. If this is what you want to do, use the GNU Lesser General |
678 | +Public License instead of this License. But first, please read |
679 | +<http://www.gnu.org/philosophy/why-not-lgpl.html>. |
680 | + |
681 | |
682 | === removed file 'COPYING' |
683 | --- COPYING 2011-03-15 16:14:46 +0000 |
684 | +++ COPYING 1970-01-01 00:00:00 +0000 |
685 | @@ -1,676 +0,0 @@ |
686 | - |
687 | - GNU GENERAL PUBLIC LICENSE |
688 | - Version 3, 29 June 2007 |
689 | - |
690 | - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> |
691 | - Everyone is permitted to copy and distribute verbatim copies |
692 | - of this license document, but changing it is not allowed. |
693 | - |
694 | - Preamble |
695 | - |
696 | - The GNU General Public License is a free, copyleft license for |
697 | -software and other kinds of works. |
698 | - |
699 | - The licenses for most software and other practical works are designed |
700 | -to take away your freedom to share and change the works. By contrast, |
701 | -the GNU General Public License is intended to guarantee your freedom to |
702 | -share and change all versions of a program--to make sure it remains free |
703 | -software for all its users. We, the Free Software Foundation, use the |
704 | -GNU General Public License for most of our software; it applies also to |
705 | -any other work released this way by its authors. You can apply it to |
706 | -your programs, too. |
707 | - |
708 | - When we speak of free software, we are referring to freedom, not |
709 | -price. Our General Public Licenses are designed to make sure that you |
710 | -have the freedom to distribute copies of free software (and charge for |
711 | -them if you wish), that you receive source code or can get it if you |
712 | -want it, that you can change the software or use pieces of it in new |
713 | -free programs, and that you know you can do these things. |
714 | - |
715 | - To protect your rights, we need to prevent others from denying you |
716 | -these rights or asking you to surrender the rights. Therefore, you have |
717 | -certain responsibilities if you distribute copies of the software, or if |
718 | -you modify it: responsibilities to respect the freedom of others. |
719 | - |
720 | - For example, if you distribute copies of such a program, whether |
721 | -gratis or for a fee, you must pass on to the recipients the same |
722 | -freedoms that you received. You must make sure that they, too, receive |
723 | -or can get the source code. And you must show them these terms so they |
724 | -know their rights. |
725 | - |
726 | - Developers that use the GNU GPL protect your rights with two steps: |
727 | -(1) assert copyright on the software, and (2) offer you this License |
728 | -giving you legal permission to copy, distribute and/or modify it. |
729 | - |
730 | - For the developers' and authors' protection, the GPL clearly explains |
731 | -that there is no warranty for this free software. For both users' and |
732 | -authors' sake, the GPL requires that modified versions be marked as |
733 | -changed, so that their problems will not be attributed erroneously to |
734 | -authors of previous versions. |
735 | - |
736 | - Some devices are designed to deny users access to install or run |
737 | -modified versions of the software inside them, although the manufacturer |
738 | -can do so. This is fundamentally incompatible with the aim of |
739 | -protecting users' freedom to change the software. The systematic |
740 | -pattern of such abuse occurs in the area of products for individuals to |
741 | -use, which is precisely where it is most unacceptable. Therefore, we |
742 | -have designed this version of the GPL to prohibit the practice for those |
743 | -products. If such problems arise substantially in other domains, we |
744 | -stand ready to extend this provision to those domains in future versions |
745 | -of the GPL, as needed to protect the freedom of users. |
746 | - |
747 | - Finally, every program is threatened constantly by software patents. |
748 | -States should not allow patents to restrict development and use of |
749 | -software on general-purpose computers, but in those that do, we wish to |
750 | -avoid the special danger that patents applied to a free program could |
751 | -make it effectively proprietary. To prevent this, the GPL assures that |
752 | -patents cannot be used to render the program non-free. |
753 | - |
754 | - The precise terms and conditions for copying, distribution and |
755 | -modification follow. |
756 | - |
757 | - TERMS AND CONDITIONS |
758 | - |
759 | - 0. Definitions. |
760 | - |
761 | - "This License" refers to version 3 of the GNU General Public License. |
762 | - |
763 | - "Copyright" also means copyright-like laws that apply to other kinds of |
764 | -works, such as semiconductor masks. |
765 | - |
766 | - "The Program" refers to any copyrightable work licensed under this |
767 | -License. Each licensee is addressed as "you". "Licensees" and |
768 | -"recipients" may be individuals or organizations. |
769 | - |
770 | - To "modify" a work means to copy from or adapt all or part of the work |
771 | -in a fashion requiring copyright permission, other than the making of an |
772 | -exact copy. The resulting work is called a "modified version" of the |
773 | -earlier work or a work "based on" the earlier work. |
774 | - |
775 | - A "covered work" means either the unmodified Program or a work based |
776 | -on the Program. |
777 | - |
778 | - To "propagate" a work means to do anything with it that, without |
779 | -permission, would make you directly or secondarily liable for |
780 | -infringement under applicable copyright law, except executing it on a |
781 | -computer or modifying a private copy. Propagation includes copying, |
782 | -distribution (with or without modification), making available to the |
783 | -public, and in some countries other activities as well. |
784 | - |
785 | - To "convey" a work means any kind of propagation that enables other |
786 | -parties to make or receive copies. Mere interaction with a user through |
787 | -a computer network, with no transfer of a copy, is not conveying. |
788 | - |
789 | - An interactive user interface displays "Appropriate Legal Notices" |
790 | -to the extent that it includes a convenient and prominently visible |
791 | -feature that (1) displays an appropriate copyright notice, and (2) |
792 | -tells the user that there is no warranty for the work (except to the |
793 | -extent that warranties are provided), that licensees may convey the |
794 | -work under this License, and how to view a copy of this License. If |
795 | -the interface presents a list of user commands or options, such as a |
796 | -menu, a prominent item in the list meets this criterion. |
797 | - |
798 | - 1. Source Code. |
799 | - |
800 | - The "source code" for a work means the preferred form of the work |
801 | -for making modifications to it. "Object code" means any non-source |
802 | -form of a work. |
803 | - |
804 | - A "Standard Interface" means an interface that either is an official |
805 | -standard defined by a recognized standards body, or, in the case of |
806 | -interfaces specified for a particular programming language, one that |
807 | -is widely used among developers working in that language. |
808 | - |
809 | - The "System Libraries" of an executable work include anything, other |
810 | -than the work as a whole, that (a) is included in the normal form of |
811 | -packaging a Major Component, but which is not part of that Major |
812 | -Component, and (b) serves only to enable use of the work with that |
813 | -Major Component, or to implement a Standard Interface for which an |
814 | -implementation is available to the public in source code form. A |
815 | -"Major Component", in this context, means a major essential component |
816 | -(kernel, window system, and so on) of the specific operating system |
817 | -(if any) on which the executable work runs, or a compiler used to |
818 | -produce the work, or an object code interpreter used to run it. |
819 | - |
820 | - The "Corresponding Source" for a work in object code form means all |
821 | -the source code needed to generate, install, and (for an executable |
822 | -work) run the object code and to modify the work, including scripts to |
823 | -control those activities. However, it does not include the work's |
824 | -System Libraries, or general-purpose tools or generally available free |
825 | -programs which are used unmodified in performing those activities but |
826 | -which are not part of the work. For example, Corresponding Source |
827 | -includes interface definition files associated with source files for |
828 | -the work, and the source code for shared libraries and dynamically |
829 | -linked subprograms that the work is specifically designed to require, |
830 | -such as by intimate data communication or control flow between those |
831 | -subprograms and other parts of the work. |
832 | - |
833 | - The Corresponding Source need not include anything that users |
834 | -can regenerate automatically from other parts of the Corresponding |
835 | -Source. |
836 | - |
837 | - The Corresponding Source for a work in source code form is that |
838 | -same work. |
839 | - |
840 | - 2. Basic Permissions. |
841 | - |
842 | - All rights granted under this License are granted for the term of |
843 | -copyright on the Program, and are irrevocable provided the stated |
844 | -conditions are met. This License explicitly affirms your unlimited |
845 | -permission to run the unmodified Program. The output from running a |
846 | -covered work is covered by this License only if the output, given its |
847 | -content, constitutes a covered work. This License acknowledges your |
848 | -rights of fair use or other equivalent, as provided by copyright law. |
849 | - |
850 | - You may make, run and propagate covered works that you do not |
851 | -convey, without conditions so long as your license otherwise remains |
852 | -in force. You may convey covered works to others for the sole purpose |
853 | -of having them make modifications exclusively for you, or provide you |
854 | -with facilities for running those works, provided that you comply with |
855 | -the terms of this License in conveying all material for which you do |
856 | -not control copyright. Those thus making or running the covered works |
857 | -for you must do so exclusively on your behalf, under your direction |
858 | -and control, on terms that prohibit them from making any copies of |
859 | -your copyrighted material outside their relationship with you. |
860 | - |
861 | - Conveying under any other circumstances is permitted solely under |
862 | -the conditions stated below. Sublicensing is not allowed; section 10 |
863 | -makes it unnecessary. |
864 | - |
865 | - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. |
866 | - |
867 | - No covered work shall be deemed part of an effective technological |
868 | -measure under any applicable law fulfilling obligations under article |
869 | -11 of the WIPO copyright treaty adopted on 20 December 1996, or |
870 | -similar laws prohibiting or restricting circumvention of such |
871 | -measures. |
872 | - |
873 | - When you convey a covered work, you waive any legal power to forbid |
874 | -circumvention of technological measures to the extent such circumvention |
875 | -is effected by exercising rights under this License with respect to |
876 | -the covered work, and you disclaim any intention to limit operation or |
877 | -modification of the work as a means of enforcing, against the work's |
878 | -users, your or third parties' legal rights to forbid circumvention of |
879 | -technological measures. |
880 | - |
881 | - 4. Conveying Verbatim Copies. |
882 | - |
883 | - You may convey verbatim copies of the Program's source code as you |
884 | -receive it, in any medium, provided that you conspicuously and |
885 | -appropriately publish on each copy an appropriate copyright notice; |
886 | -keep intact all notices stating that this License and any |
887 | -non-permissive terms added in accord with section 7 apply to the code; |
888 | -keep intact all notices of the absence of any warranty; and give all |
889 | -recipients a copy of this License along with the Program. |
890 | - |
891 | - You may charge any price or no price for each copy that you convey, |
892 | -and you may offer support or warranty protection for a fee. |
893 | - |
894 | - 5. Conveying Modified Source Versions. |
895 | - |
896 | - You may convey a work based on the Program, or the modifications to |
897 | -produce it from the Program, in the form of source code under the |
898 | -terms of section 4, provided that you also meet all of these conditions: |
899 | - |
900 | - a) The work must carry prominent notices stating that you modified |
901 | - it, and giving a relevant date. |
902 | - |
903 | - b) The work must carry prominent notices stating that it is |
904 | - released under this License and any conditions added under section |
905 | - 7. This requirement modifies the requirement in section 4 to |
906 | - "keep intact all notices". |
907 | - |
908 | - c) You must license the entire work, as a whole, under this |
909 | - License to anyone who comes into possession of a copy. This |
910 | - License will therefore apply, along with any applicable section 7 |
911 | - additional terms, to the whole of the work, and all its parts, |
912 | - regardless of how they are packaged. This License gives no |
913 | - permission to license the work in any other way, but it does not |
914 | - invalidate such permission if you have separately received it. |
915 | - |
916 | - d) If the work has interactive user interfaces, each must display |
917 | - Appropriate Legal Notices; however, if the Program has interactive |
918 | - interfaces that do not display Appropriate Legal Notices, your |
919 | - work need not make them do so. |
920 | - |
921 | - A compilation of a covered work with other separate and independent |
922 | -works, which are not by their nature extensions of the covered work, |
923 | -and which are not combined with it such as to form a larger program, |
924 | -in or on a volume of a storage or distribution medium, is called an |
925 | -"aggregate" if the compilation and its resulting copyright are not |
926 | -used to limit the access or legal rights of the compilation's users |
927 | -beyond what the individual works permit. Inclusion of a covered work |
928 | -in an aggregate does not cause this License to apply to the other |
929 | -parts of the aggregate. |
930 | - |
931 | - 6. Conveying Non-Source Forms. |
932 | - |
933 | - You may convey a covered work in object code form under the terms |
934 | -of sections 4 and 5, provided that you also convey the |
935 | -machine-readable Corresponding Source under the terms of this License, |
936 | -in one of these ways: |
937 | - |
938 | - a) Convey the object code in, or embodied in, a physical product |
939 | - (including a physical distribution medium), accompanied by the |
940 | - Corresponding Source fixed on a durable physical medium |
941 | - customarily used for software interchange. |
942 | - |
943 | - b) Convey the object code in, or embodied in, a physical product |
944 | - (including a physical distribution medium), accompanied by a |
945 | - written offer, valid for at least three years and valid for as |
946 | - long as you offer spare parts or customer support for that product |
947 | - model, to give anyone who possesses the object code either (1) a |
948 | - copy of the Corresponding Source for all the software in the |
949 | - product that is covered by this License, on a durable physical |
950 | - medium customarily used for software interchange, for a price no |
951 | - more than your reasonable cost of physically performing this |
952 | - conveying of source, or (2) access to copy the |
953 | - Corresponding Source from a network server at no charge. |
954 | - |
955 | - c) Convey individual copies of the object code with a copy of the |
956 | - written offer to provide the Corresponding Source. This |
957 | - alternative is allowed only occasionally and noncommercially, and |
958 | - only if you received the object code with such an offer, in accord |
959 | - with subsection 6b. |
960 | - |
961 | - d) Convey the object code by offering access from a designated |
962 | - place (gratis or for a charge), and offer equivalent access to the |
963 | - Corresponding Source in the same way through the same place at no |
964 | - further charge. You need not require recipients to copy the |
965 | - Corresponding Source along with the object code. If the place to |
966 | - copy the object code is a network server, the Corresponding Source |
967 | - may be on a different server (operated by you or a third party) |
968 | - that supports equivalent copying facilities, provided you maintain |
969 | - clear directions next to the object code saying where to find the |
970 | - Corresponding Source. Regardless of what server hosts the |
971 | - Corresponding Source, you remain obligated to ensure that it is |
972 | - available for as long as needed to satisfy these requirements. |
973 | - |
974 | - e) Convey the object code using peer-to-peer transmission, provided |
975 | - you inform other peers where the object code and Corresponding |
976 | - Source of the work are being offered to the general public at no |
977 | - charge under subsection 6d. |
978 | - |
979 | - A separable portion of the object code, whose source code is excluded |
980 | -from the Corresponding Source as a System Library, need not be |
981 | -included in conveying the object code work. |
982 | - |
983 | - A "User Product" is either (1) a "consumer product", which means any |
984 | -tangible personal property which is normally used for personal, family, |
985 | -or household purposes, or (2) anything designed or sold for incorporation |
986 | -into a dwelling. In determining whether a product is a consumer product, |
987 | -doubtful cases shall be resolved in favor of coverage. For a particular |
988 | -product received by a particular user, "normally used" refers to a |
989 | -typical or common use of that class of product, regardless of the status |
990 | -of the particular user or of the way in which the particular user |
991 | -actually uses, or expects or is expected to use, the product. A product |
992 | -is a consumer product regardless of whether the product has substantial |
993 | -commercial, industrial or non-consumer uses, unless such uses represent |
994 | -the only significant mode of use of the product. |
995 | - |
996 | - "Installation Information" for a User Product means any methods, |
997 | -procedures, authorization keys, or other information required to install |
998 | -and execute modified versions of a covered work in that User Product from |
999 | -a modified version of its Corresponding Source. The information must |
1000 | -suffice to ensure that the continued functioning of the modified object |
1001 | -code is in no case prevented or interfered with solely because |
1002 | -modification has been made. |
1003 | - |
1004 | - If you convey an object code work under this section in, or with, or |
1005 | -specifically for use in, a User Product, and the conveying occurs as |
1006 | -part of a transaction in which the right of possession and use of the |
1007 | -User Product is transferred to the recipient in perpetuity or for a |
1008 | -fixed term (regardless of how the transaction is characterized), the |
1009 | -Corresponding Source conveyed under this section must be accompanied |
1010 | -by the Installation Information. But this requirement does not apply |
1011 | -if neither you nor any third party retains the ability to install |
1012 | -modified object code on the User Product (for example, the work has |
1013 | -been installed in ROM). |
1014 | - |
1015 | - The requirement to provide Installation Information does not include a |
1016 | -requirement to continue to provide support service, warranty, or updates |
1017 | -for a work that has been modified or installed by the recipient, or for |
1018 | -the User Product in which it has been modified or installed. Access to a |
1019 | -network may be denied when the modification itself materially and |
1020 | -adversely affects the operation of the network or violates the rules and |
1021 | -protocols for communication across the network. |
1022 | - |
1023 | - Corresponding Source conveyed, and Installation Information provided, |
1024 | -in accord with this section must be in a format that is publicly |
1025 | -documented (and with an implementation available to the public in |
1026 | -source code form), and must require no special password or key for |
1027 | -unpacking, reading or copying. |
1028 | - |
1029 | - 7. Additional Terms. |
1030 | - |
1031 | - "Additional permissions" are terms that supplement the terms of this |
1032 | -License by making exceptions from one or more of its conditions. |
1033 | -Additional permissions that are applicable to the entire Program shall |
1034 | -be treated as though they were included in this License, to the extent |
1035 | -that they are valid under applicable law. If additional permissions |
1036 | -apply only to part of the Program, that part may be used separately |
1037 | -under those permissions, but the entire Program remains governed by |
1038 | -this License without regard to the additional permissions. |
1039 | - |
1040 | - When you convey a copy of a covered work, you may at your option |
1041 | -remove any additional permissions from that copy, or from any part of |
1042 | -it. (Additional permissions may be written to require their own |
1043 | -removal in certain cases when you modify the work.) You may place |
1044 | -additional permissions on material, added by you to a covered work, |
1045 | -for which you have or can give appropriate copyright permission. |
1046 | - |
1047 | - Notwithstanding any other provision of this License, for material you |
1048 | -add to a covered work, you may (if authorized by the copyright holders of |
1049 | -that material) supplement the terms of this License with terms: |
1050 | - |
1051 | - a) Disclaiming warranty or limiting liability differently from the |
1052 | - terms of sections 15 and 16 of this License; or |
1053 | - |
1054 | - b) Requiring preservation of specified reasonable legal notices or |
1055 | - author attributions in that material or in the Appropriate Legal |
1056 | - Notices displayed by works containing it; or |
1057 | - |
1058 | - c) Prohibiting misrepresentation of the origin of that material, or |
1059 | - requiring that modified versions of such material be marked in |
1060 | - reasonable ways as different from the original version; or |
1061 | - |
1062 | - d) Limiting the use for publicity purposes of names of licensors or |
1063 | - authors of the material; or |
1064 | - |
1065 | - e) Declining to grant rights under trademark law for use of some |
1066 | - trade names, trademarks, or service marks; or |
1067 | - |
1068 | - f) Requiring indemnification of licensors and authors of that |
1069 | - material by anyone who conveys the material (or modified versions of |
1070 | - it) with contractual assumptions of liability to the recipient, for |
1071 | - any liability that these contractual assumptions directly impose on |
1072 | - those licensors and authors. |
1073 | - |
1074 | - All other non-permissive additional terms are considered "further |
1075 | -restrictions" within the meaning of section 10. If the Program as you |
1076 | -received it, or any part of it, contains a notice stating that it is |
1077 | -governed by this License along with a term that is a further |
1078 | -restriction, you may remove that term. If a license document contains |
1079 | -a further restriction but permits relicensing or conveying under this |
1080 | -License, you may add to a covered work material governed by the terms |
1081 | -of that license document, provided that the further restriction does |
1082 | -not survive such relicensing or conveying. |
1083 | - |
1084 | - If you add terms to a covered work in accord with this section, you |
1085 | -must place, in the relevant source files, a statement of the |
1086 | -additional terms that apply to those files, or a notice indicating |
1087 | -where to find the applicable terms. |
1088 | - |
1089 | - Additional terms, permissive or non-permissive, may be stated in the |
1090 | -form of a separately written license, or stated as exceptions; |
1091 | -the above requirements apply either way. |
1092 | - |
1093 | - 8. Termination. |
1094 | - |
1095 | - You may not propagate or modify a covered work except as expressly |
1096 | -provided under this License. Any attempt otherwise to propagate or |
1097 | -modify it is void, and will automatically terminate your rights under |
1098 | -this License (including any patent licenses granted under the third |
1099 | -paragraph of section 11). |
1100 | - |
1101 | - However, if you cease all violation of this License, then your |
1102 | -license from a particular copyright holder is reinstated (a) |
1103 | -provisionally, unless and until the copyright holder explicitly and |
1104 | -finally terminates your license, and (b) permanently, if the copyright |
1105 | -holder fails to notify you of the violation by some reasonable means |
1106 | -prior to 60 days after the cessation. |
1107 | - |
1108 | - Moreover, your license from a particular copyright holder is |
1109 | -reinstated permanently if the copyright holder notifies you of the |
1110 | -violation by some reasonable means, this is the first time you have |
1111 | -received notice of violation of this License (for any work) from that |
1112 | -copyright holder, and you cure the violation prior to 30 days after |
1113 | -your receipt of the notice. |
1114 | - |
1115 | - Termination of your rights under this section does not terminate the |
1116 | -licenses of parties who have received copies or rights from you under |
1117 | -this License. If your rights have been terminated and not permanently |
1118 | -reinstated, you do not qualify to receive new licenses for the same |
1119 | -material under section 10. |
1120 | - |
1121 | - 9. Acceptance Not Required for Having Copies. |
1122 | - |
1123 | - You are not required to accept this License in order to receive or |
1124 | -run a copy of the Program. Ancillary propagation of a covered work |
1125 | -occurring solely as a consequence of using peer-to-peer transmission |
1126 | -to receive a copy likewise does not require acceptance. However, |
1127 | -nothing other than this License grants you permission to propagate or |
1128 | -modify any covered work. These actions infringe copyright if you do |
1129 | -not accept this License. Therefore, by modifying or propagating a |
1130 | -covered work, you indicate your acceptance of this License to do so. |
1131 | - |
1132 | - 10. Automatic Licensing of Downstream Recipients. |
1133 | - |
1134 | - Each time you convey a covered work, the recipient automatically |
1135 | -receives a license from the original licensors, to run, modify and |
1136 | -propagate that work, subject to this License. You are not responsible |
1137 | -for enforcing compliance by third parties with this License. |
1138 | - |
1139 | - An "entity transaction" is a transaction transferring control of an |
1140 | -organization, or substantially all assets of one, or subdividing an |
1141 | -organization, or merging organizations. If propagation of a covered |
1142 | -work results from an entity transaction, each party to that |
1143 | -transaction who receives a copy of the work also receives whatever |
1144 | -licenses to the work the party's predecessor in interest had or could |
1145 | -give under the previous paragraph, plus a right to possession of the |
1146 | -Corresponding Source of the work from the predecessor in interest, if |
1147 | -the predecessor has it or can get it with reasonable efforts. |
1148 | - |
1149 | - You may not impose any further restrictions on the exercise of the |
1150 | -rights granted or affirmed under this License. For example, you may |
1151 | -not impose a license fee, royalty, or other charge for exercise of |
1152 | -rights granted under this License, and you may not initiate litigation |
1153 | -(including a cross-claim or counterclaim in a lawsuit) alleging that |
1154 | -any patent claim is infringed by making, using, selling, offering for |
1155 | -sale, or importing the Program or any portion of it. |
1156 | - |
1157 | - 11. Patents. |
1158 | - |
1159 | - A "contributor" is a copyright holder who authorizes use under this |
1160 | -License of the Program or a work on which the Program is based. The |
1161 | -work thus licensed is called the contributor's "contributor version". |
1162 | - |
1163 | - A contributor's "essential patent claims" are all patent claims |
1164 | -owned or controlled by the contributor, whether already acquired or |
1165 | -hereafter acquired, that would be infringed by some manner, permitted |
1166 | -by this License, of making, using, or selling its contributor version, |
1167 | -but do not include claims that would be infringed only as a |
1168 | -consequence of further modification of the contributor version. For |
1169 | -purposes of this definition, "control" includes the right to grant |
1170 | -patent sublicenses in a manner consistent with the requirements of |
1171 | -this License. |
1172 | - |
1173 | - Each contributor grants you a non-exclusive, worldwide, royalty-free |
1174 | -patent license under the contributor's essential patent claims, to |
1175 | -make, use, sell, offer for sale, import and otherwise run, modify and |
1176 | -propagate the contents of its contributor version. |
1177 | - |
1178 | - In the following three paragraphs, a "patent license" is any express |
1179 | -agreement or commitment, however denominated, not to enforce a patent |
1180 | -(such as an express permission to practice a patent or covenant not to |
1181 | -sue for patent infringement). To "grant" such a patent license to a |
1182 | -party means to make such an agreement or commitment not to enforce a |
1183 | -patent against the party. |
1184 | - |
1185 | - If you convey a covered work, knowingly relying on a patent license, |
1186 | -and the Corresponding Source of the work is not available for anyone |
1187 | -to copy, free of charge and under the terms of this License, through a |
1188 | -publicly available network server or other readily accessible means, |
1189 | -then you must either (1) cause the Corresponding Source to be so |
1190 | -available, or (2) arrange to deprive yourself of the benefit of the |
1191 | -patent license for this particular work, or (3) arrange, in a manner |
1192 | -consistent with the requirements of this License, to extend the patent |
1193 | -license to downstream recipients. "Knowingly relying" means you have |
1194 | -actual knowledge that, but for the patent license, your conveying the |
1195 | -covered work in a country, or your recipient's use of the covered work |
1196 | -in a country, would infringe one or more identifiable patents in that |
1197 | -country that you have reason to believe are valid. |
1198 | - |
1199 | - If, pursuant to or in connection with a single transaction or |
1200 | -arrangement, you convey, or propagate by procuring conveyance of, a |
1201 | -covered work, and grant a patent license to some of the parties |
1202 | -receiving the covered work authorizing them to use, propagate, modify |
1203 | -or convey a specific copy of the covered work, then the patent license |
1204 | -you grant is automatically extended to all recipients of the covered |
1205 | -work and works based on it. |
1206 | - |
1207 | - A patent license is "discriminatory" if it does not include within |
1208 | -the scope of its coverage, prohibits the exercise of, or is |
1209 | -conditioned on the non-exercise of one or more of the rights that are |
1210 | -specifically granted under this License. You may not convey a covered |
1211 | -work if you are a party to an arrangement with a third party that is |
1212 | -in the business of distributing software, under which you make payment |
1213 | -to the third party based on the extent of your activity of conveying |
1214 | -the work, and under which the third party grants, to any of the |
1215 | -parties who would receive the covered work from you, a discriminatory |
1216 | -patent license (a) in connection with copies of the covered work |
1217 | -conveyed by you (or copies made from those copies), or (b) primarily |
1218 | -for and in connection with specific products or compilations that |
1219 | -contain the covered work, unless you entered into that arrangement, |
1220 | -or that patent license was granted, prior to 28 March 2007. |
1221 | - |
1222 | - Nothing in this License shall be construed as excluding or limiting |
1223 | -any implied license or other defenses to infringement that may |
1224 | -otherwise be available to you under applicable patent law. |
1225 | - |
1226 | - 12. No Surrender of Others' Freedom. |
1227 | - |
1228 | - If conditions are imposed on you (whether by court order, agreement or |
1229 | -otherwise) that contradict the conditions of this License, they do not |
1230 | -excuse you from the conditions of this License. If you cannot convey a |
1231 | -covered work so as to satisfy simultaneously your obligations under this |
1232 | -License and any other pertinent obligations, then as a consequence you may |
1233 | -not convey it at all. For example, if you agree to terms that obligate you |
1234 | -to collect a royalty for further conveying from those to whom you convey |
1235 | -the Program, the only way you could satisfy both those terms and this |
1236 | -License would be to refrain entirely from conveying the Program. |
1237 | - |
1238 | - 13. Use with the GNU Affero General Public License. |
1239 | - |
1240 | - Notwithstanding any other provision of this License, you have |
1241 | -permission to link or combine any covered work with a work licensed |
1242 | -under version 3 of the GNU Affero General Public License into a single |
1243 | -combined work, and to convey the resulting work. The terms of this |
1244 | -License will continue to apply to the part which is the covered work, |
1245 | -but the special requirements of the GNU Affero General Public License, |
1246 | -section 13, concerning interaction through a network will apply to the |
1247 | -combination as such. |
1248 | - |
1249 | - 14. Revised Versions of this License. |
1250 | - |
1251 | - The Free Software Foundation may publish revised and/or new versions of |
1252 | -the GNU General Public License from time to time. Such new versions will |
1253 | -be similar in spirit to the present version, but may differ in detail to |
1254 | -address new problems or concerns. |
1255 | - |
1256 | - Each version is given a distinguishing version number. If the |
1257 | -Program specifies that a certain numbered version of the GNU General |
1258 | -Public License "or any later version" applies to it, you have the |
1259 | -option of following the terms and conditions either of that numbered |
1260 | -version or of any later version published by the Free Software |
1261 | -Foundation. If the Program does not specify a version number of the |
1262 | -GNU General Public License, you may choose any version ever published |
1263 | -by the Free Software Foundation. |
1264 | - |
1265 | - If the Program specifies that a proxy can decide which future |
1266 | -versions of the GNU General Public License can be used, that proxy's |
1267 | -public statement of acceptance of a version permanently authorizes you |
1268 | -to choose that version for the Program. |
1269 | - |
1270 | - Later license versions may give you additional or different |
1271 | -permissions. However, no additional obligations are imposed on any |
1272 | -author or copyright holder as a result of your choosing to follow a |
1273 | -later version. |
1274 | - |
1275 | - 15. Disclaimer of Warranty. |
1276 | - |
1277 | - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY |
1278 | -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT |
1279 | -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY |
1280 | -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, |
1281 | -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
1282 | -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM |
1283 | -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF |
1284 | -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. |
1285 | - |
1286 | - 16. Limitation of Liability. |
1287 | - |
1288 | - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING |
1289 | -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS |
1290 | -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY |
1291 | -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE |
1292 | -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF |
1293 | -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD |
1294 | -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), |
1295 | -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF |
1296 | -SUCH DAMAGES. |
1297 | - |
1298 | - 17. Interpretation of Sections 15 and 16. |
1299 | - |
1300 | - If the disclaimer of warranty and limitation of liability provided |
1301 | -above cannot be given local legal effect according to their terms, |
1302 | -reviewing courts shall apply local law that most closely approximates |
1303 | -an absolute waiver of all civil liability in connection with the |
1304 | -Program, unless a warranty or assumption of liability accompanies a |
1305 | -copy of the Program in return for a fee. |
1306 | - |
1307 | - END OF TERMS AND CONDITIONS |
1308 | - |
1309 | - How to Apply These Terms to Your New Programs |
1310 | - |
1311 | - If you develop a new program, and you want it to be of the greatest |
1312 | -possible use to the public, the best way to achieve this is to make it |
1313 | -free software which everyone can redistribute and change under these terms. |
1314 | - |
1315 | - To do so, attach the following notices to the program. It is safest |
1316 | -to attach them to the start of each source file to most effectively |
1317 | -state the exclusion of warranty; and each file should have at least |
1318 | -the "copyright" line and a pointer to where the full notice is found. |
1319 | - |
1320 | - <one line to give the program's name and a brief idea of what it does.> |
1321 | - Copyright (C) <year> <name of author> |
1322 | - |
1323 | - This program is free software: you can redistribute it and/or modify |
1324 | - it under the terms of the GNU General Public License as published by |
1325 | - the Free Software Foundation, either version 3 of the License, or |
1326 | - (at your option) any later version. |
1327 | - |
1328 | - This program is distributed in the hope that it will be useful, |
1329 | - but WITHOUT ANY WARRANTY; without even the implied warranty of |
1330 | - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1331 | - GNU General Public License for more details. |
1332 | - |
1333 | - You should have received a copy of the GNU General Public License |
1334 | - along with this program. If not, see <http://www.gnu.org/licenses/>. |
1335 | - |
1336 | -Also add information on how to contact you by electronic and paper mail. |
1337 | - |
1338 | - If the program does terminal interaction, make it output a short |
1339 | -notice like this when it starts in an interactive mode: |
1340 | - |
1341 | - <program> Copyright (C) <year> <name of author> |
1342 | - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. |
1343 | - This is free software, and you are welcome to redistribute it |
1344 | - under certain conditions; type `show c' for details. |
1345 | - |
1346 | -The hypothetical commands `show w' and `show c' should show the appropriate |
1347 | -parts of the General Public License. Of course, your program's commands |
1348 | -might be different; for a GUI interface, you would use an "about box". |
1349 | - |
1350 | - You should also get your employer (if you work as a programmer) or school, |
1351 | -if any, to sign a "copyright disclaimer" for the program, if necessary. |
1352 | -For more information on this, and how to apply and follow the GNU GPL, see |
1353 | -<http://www.gnu.org/licenses/>. |
1354 | - |
1355 | - The GNU General Public License does not permit incorporating your program |
1356 | -into proprietary programs. If your program is a subroutine library, you |
1357 | -may consider it more useful to permit linking proprietary applications with |
1358 | -the library. If this is what you want to do, use the GNU Lesser General |
1359 | -Public License instead of this License. But first, please read |
1360 | -<http://www.gnu.org/philosophy/why-not-lgpl.html>. |
1361 | - |
1362 | |
1363 | === modified file 'ChangeLog' |
1364 | --- ChangeLog 2011-03-15 16:12:40 +0000 |
1365 | +++ ChangeLog 2012-08-20 20:53:20 +0000 |
1366 | @@ -1,4 +1,11 @@ |
1367 | ------------------------------------------------------------ |
1368 | +revno: 31 |
1369 | +committer: Chase Douglas <chase.douglas@canonical.com> |
1370 | +branch nick: 1.0.5 |
1371 | +timestamp: Wed 2012-08-15 09:55:29 -0700 |
1372 | +message: |
1373 | + Rename project to simply 'evemu' |
1374 | +------------------------------------------------------------ |
1375 | revno: 30 |
1376 | tags: v1.0.5 |
1377 | committer: Henrik Rydberg <rydberg@bitmath.org> |
1378 | @@ -221,7 +228,6 @@ |
1379 | run mixed library implementations. |
1380 | ------------------------------------------------------------ |
1381 | revno: 9 |
1382 | -git commit: a8df0405686350c3145b3e5119d796c6642339fd |
1383 | committer: Henrik Rydberg <rydberg@euromail.se> |
1384 | timestamp: Thu 2010-11-18 14:56:30 +0100 |
1385 | message: |
1386 | @@ -237,7 +243,6 @@ |
1387 | Signed-off-by: Henrik Rydberg <rydberg@euromail.se> |
1388 | ------------------------------------------------------------ |
1389 | revno: 8 |
1390 | -git commit: ee6f73d719d8188ecfcc7f562f845f0a3461e25f |
1391 | committer: Henrik Rydberg <rydberg@euromail.se> |
1392 | timestamp: Thu 2010-09-23 17:53:46 +0200 |
1393 | message: |
1394 | @@ -249,7 +254,6 @@ |
1395 | Signed-off-by: Henrik Rydberg <rydberg@euromail.se> |
1396 | ------------------------------------------------------------ |
1397 | revno: 7 |
1398 | -git commit: 5059c335c46c3d250deaa6afaca2f7740bdddf36 |
1399 | committer: Henrik Rydberg <rydberg@euromail.se> |
1400 | timestamp: Wed 2010-09-22 17:14:42 +0200 |
1401 | message: |
1402 | @@ -263,7 +267,6 @@ |
1403 | ------------------------------------------------------------ |
1404 | revno: 6 |
1405 | tags: v1.0.0 |
1406 | -git commit: 7a6456b7db6faa279c669db2e5838a4d6de23eda |
1407 | committer: Henrik Rydberg <rydberg@euromail.se> |
1408 | timestamp: Sun 2010-09-19 20:15:10 +0200 |
1409 | message: |
1410 | @@ -276,7 +279,6 @@ |
1411 | Signed-off-by: Henrik Rydberg <rydberg@euromail.se> |
1412 | ------------------------------------------------------------ |
1413 | revno: 5 |
1414 | -git commit: 7084c36b584acc4626b113b82af400f88f04897b |
1415 | committer: Henrik Rydberg <rydberg@euromail.se> |
1416 | timestamp: Sun 2010-09-19 10:43:49 +0200 |
1417 | message: |
1418 | @@ -287,7 +289,6 @@ |
1419 | Signed-off-by: Henrik Rydberg <rydberg@euromail.se> |
1420 | ------------------------------------------------------------ |
1421 | revno: 4 |
1422 | -git commit: 257fcdc55595335b9ffb31a436fc310ed6d9e0d4 |
1423 | committer: Henrik Rydberg <rydberg@euromail.se> |
1424 | timestamp: Sun 2010-09-19 10:29:30 +0200 |
1425 | message: |
1426 | @@ -296,7 +297,6 @@ |
1427 | Signed-off-by: Henrik Rydberg <rydberg@euromail.se> |
1428 | ------------------------------------------------------------ |
1429 | revno: 3 |
1430 | -git commit: 643ebb8d70a99fbb17e9c9b9b89122b039ef5bd0 |
1431 | committer: Henrik Rydberg <rydberg@euromail.se> |
1432 | timestamp: Sun 2010-09-19 09:54:48 +0200 |
1433 | message: |
1434 | @@ -305,7 +305,6 @@ |
1435 | Signed-off-by: Henrik Rydberg <rydberg@euromail.se> |
1436 | ------------------------------------------------------------ |
1437 | revno: 2 |
1438 | -git commit: 576078ffa78a62a2c807f5a3b471aed815d3ace4 |
1439 | committer: Henrik Rydberg <rydberg@bitmath.org> |
1440 | timestamp: Sun 2010-09-19 09:38:18 +0200 |
1441 | message: |
1442 | @@ -316,7 +315,6 @@ |
1443 | Signed-off-by: Henrik Rydberg <rydberg@bitmath.org> |
1444 | ------------------------------------------------------------ |
1445 | revno: 1 |
1446 | -git commit: 9bec5056ec35008afd4d68528718fd4519cd3503 |
1447 | committer: Henrik Rydberg <rydberg@euromail.se> |
1448 | timestamp: Sat 2010-09-18 19:10:11 +0200 |
1449 | message: |
1450 | |
1451 | === added file 'INSTALL' |
1452 | --- INSTALL 1970-01-01 00:00:00 +0000 |
1453 | +++ INSTALL 2012-08-20 20:53:20 +0000 |
1454 | @@ -0,0 +1,38 @@ |
1455 | +evemu - Kernel device emulation |
1456 | + |
1457 | +To build, you need to have the autoconf and libtool packages |
1458 | +installed. Then, do |
1459 | + |
1460 | + ./autogen.sh |
1461 | + ./configure |
1462 | + make |
1463 | + |
1464 | +To extract the properties of a device at /dev/input/eventX, do |
1465 | + |
1466 | + sudo ./tools/evemu-describe /dev/input/eventX > device.properties |
1467 | + |
1468 | +To record a stream of events, do |
1469 | + |
1470 | + sudo ./tools/evemu-record /dev/input/eventX > device.data |
1471 | + |
1472 | +To create a device from the properties, do |
1473 | + |
1474 | + sudo ./tools/evemu-device device.properties |
1475 | + |
1476 | +To replay a stream of events, do |
1477 | + |
1478 | + sudo ./tools/evemu-play /dev/input/eventY < device.data |
1479 | + |
1480 | +To destroy the device, do |
1481 | + |
1482 | + sudo ./tools/evemu-destroy /dev/input/eventY |
1483 | + |
1484 | +To install evemu, do |
1485 | + |
1486 | + sudo make install |
1487 | + |
1488 | +By default, evemu installs to /usr/local. To change, use the --prefix |
1489 | +configure option. |
1490 | + |
1491 | +Enjoy, |
1492 | +Henrik |
1493 | |
1494 | === removed file 'INSTALL' |
1495 | --- INSTALL 2010-12-22 09:37:33 +0000 |
1496 | +++ INSTALL 1970-01-01 00:00:00 +0000 |
1497 | @@ -1,38 +0,0 @@ |
1498 | -evemu - Kernel device emulation |
1499 | - |
1500 | -To build, you need to have the autoconf and libtool packages |
1501 | -installed. Then, do |
1502 | - |
1503 | - ./autogen.sh |
1504 | - ./configure |
1505 | - make |
1506 | - |
1507 | -To extract the properties of a device at /dev/input/eventX, do |
1508 | - |
1509 | - sudo ./tools/evemu-describe /dev/input/eventX > device.properties |
1510 | - |
1511 | -To record a stream of events, do |
1512 | - |
1513 | - sudo ./tools/evemu-record /dev/input/eventX > device.data |
1514 | - |
1515 | -To create a device from the properties, do |
1516 | - |
1517 | - sudo ./tools/evemu-device device.properties |
1518 | - |
1519 | -To replay a stream of events, do |
1520 | - |
1521 | - sudo ./tools/evemu-play /dev/input/eventY < device.data |
1522 | - |
1523 | -To destroy the device, do |
1524 | - |
1525 | - sudo ./tools/evemu-destroy /dev/input/eventY |
1526 | - |
1527 | -To install evemu, do |
1528 | - |
1529 | - sudo make install |
1530 | - |
1531 | -By default, evemu installs to /usr/local. To change, use the --prefix |
1532 | -configure option. |
1533 | - |
1534 | -Enjoy, |
1535 | -Henrik |
1536 | |
1537 | === added file 'Makefile.am' |
1538 | --- Makefile.am 1970-01-01 00:00:00 +0000 |
1539 | +++ Makefile.am 2012-08-20 20:53:20 +0000 |
1540 | @@ -0,0 +1,14 @@ |
1541 | +SUBDIRS = src tools |
1542 | + |
1543 | +pkgconfigdir = $(libdir)/pkgconfig |
1544 | +pkgconfig_DATA = evemu.pc |
1545 | + |
1546 | +INCLUDES = $(top_srcdir)/include/ |
1547 | + |
1548 | +.PHONY: ChangeLog INSTALL |
1549 | +INSTALL: |
1550 | + $(INSTALL_CMD) |
1551 | +ChangeLog: |
1552 | + bzr log > ChangeLog |
1553 | + |
1554 | +dist-hook: ChangeLog INSTALL |
1555 | |
1556 | === removed file 'Makefile.am' |
1557 | --- Makefile.am 2010-12-22 08:47:30 +0000 |
1558 | +++ Makefile.am 1970-01-01 00:00:00 +0000 |
1559 | @@ -1,14 +0,0 @@ |
1560 | -SUBDIRS = src tools |
1561 | - |
1562 | -pkgconfigdir = $(libdir)/pkgconfig |
1563 | -pkgconfig_DATA = utouch-evemu.pc |
1564 | - |
1565 | -INCLUDES = $(top_srcdir)/include/ |
1566 | - |
1567 | -.PHONY: ChangeLog INSTALL |
1568 | -INSTALL: |
1569 | - $(INSTALL_CMD) |
1570 | -ChangeLog: |
1571 | - bzr log > ChangeLog |
1572 | - |
1573 | -dist-hook: ChangeLog INSTALL |
1574 | |
1575 | === modified file 'Makefile.in' |
1576 | --- Makefile.in 2011-01-05 10:58:59 +0000 |
1577 | +++ Makefile.in 2012-08-20 20:53:20 +0000 |
1578 | @@ -1,9 +1,9 @@ |
1579 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
1580 | +# Makefile.in generated by automake 1.11.5 from Makefile.am. |
1581 | # @configure_input@ |
1582 | |
1583 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
1584 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
1585 | -# Inc. |
1586 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
1587 | +# Foundation, Inc. |
1588 | # This Makefile.in is free software; the Free Software Foundation |
1589 | # gives unlimited permission to copy and/or distribute it, |
1590 | # with or without modifications, as long as this notice is preserved. |
1591 | @@ -16,6 +16,23 @@ |
1592 | @SET_MAKE@ |
1593 | |
1594 | VPATH = @srcdir@ |
1595 | +am__make_dryrun = \ |
1596 | + { \ |
1597 | + am__dry=no; \ |
1598 | + case $$MAKEFLAGS in \ |
1599 | + *\\[\ \ ]*) \ |
1600 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
1601 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
1602 | + *) \ |
1603 | + for am__flg in $$MAKEFLAGS; do \ |
1604 | + case $$am__flg in \ |
1605 | + *=*|--*) ;; \ |
1606 | + *n*) am__dry=yes; break;; \ |
1607 | + esac; \ |
1608 | + done;; \ |
1609 | + esac; \ |
1610 | + test $$am__dry = yes; \ |
1611 | + } |
1612 | pkgdatadir = $(datadir)/@PACKAGE@ |
1613 | pkgincludedir = $(includedir)/@PACKAGE@ |
1614 | pkglibdir = $(libdir)/@PACKAGE@ |
1615 | @@ -37,7 +54,7 @@ |
1616 | subdir = . |
1617 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
1618 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ |
1619 | - $(srcdir)/utouch-evemu.pc.in $(top_srcdir)/configure COPYING \ |
1620 | + $(srcdir)/evemu.pc.in $(top_srcdir)/configure COPYING \ |
1621 | ChangeLog INSTALL config-aux/config.guess \ |
1622 | config-aux/config.sub config-aux/depcomp config-aux/install-sh \ |
1623 | config-aux/ltmain.sh config-aux/missing |
1624 | @@ -49,7 +66,7 @@ |
1625 | configure.lineno config.status.lineno |
1626 | mkinstalldirs = $(install_sh) -d |
1627 | CONFIG_HEADER = config.h |
1628 | -CONFIG_CLEAN_FILES = utouch-evemu.pc |
1629 | +CONFIG_CLEAN_FILES = evemu.pc |
1630 | CONFIG_CLEAN_VPATH_FILES = |
1631 | SOURCES = |
1632 | DIST_SOURCES = |
1633 | @@ -60,6 +77,11 @@ |
1634 | install-pdf-recursive install-ps-recursive install-recursive \ |
1635 | installcheck-recursive installdirs-recursive pdf-recursive \ |
1636 | ps-recursive uninstall-recursive |
1637 | +am__can_run_installinfo = \ |
1638 | + case $$AM_UPDATE_INFO_DIR in \ |
1639 | + n|no|NO) false;; \ |
1640 | + *) (install-info --version) >/dev/null 2>&1;; \ |
1641 | + esac |
1642 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
1643 | am__vpath_adj = case $$p in \ |
1644 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
1645 | @@ -81,6 +103,12 @@ |
1646 | am__base_list = \ |
1647 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
1648 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
1649 | +am__uninstall_files_from_dir = { \ |
1650 | + test -z "$$files" \ |
1651 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
1652 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
1653 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
1654 | + } |
1655 | am__installdirs = "$(DESTDIR)$(pkgconfigdir)" |
1656 | DATA = $(pkgconfig_DATA) |
1657 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
1658 | @@ -95,9 +123,11 @@ |
1659 | distdir = $(PACKAGE)-$(VERSION) |
1660 | top_distdir = $(distdir) |
1661 | am__remove_distdir = \ |
1662 | - { test ! -d "$(distdir)" \ |
1663 | - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
1664 | - && rm -fr "$(distdir)"; }; } |
1665 | + if test -d "$(distdir)"; then \ |
1666 | + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
1667 | + && rm -rf "$(distdir)" \ |
1668 | + || { sleep 5 && rm -rf "$(distdir)"; }; \ |
1669 | + else :; fi |
1670 | am__relativize = \ |
1671 | dir0=`pwd`; \ |
1672 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
1673 | @@ -126,6 +156,8 @@ |
1674 | DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 |
1675 | GZIP_ENV = --best |
1676 | distuninstallcheck_listfiles = find . -type f -print |
1677 | +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ |
1678 | + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' |
1679 | distcleancheck_listfiles = find . -type f -print |
1680 | ACLOCAL = @ACLOCAL@ |
1681 | AMTAR = @AMTAR@ |
1682 | @@ -143,6 +175,7 @@ |
1683 | CYGPATH_W = @CYGPATH_W@ |
1684 | DEFS = @DEFS@ |
1685 | DEPDIR = @DEPDIR@ |
1686 | +DLLTOOL = @DLLTOOL@ |
1687 | DSYMUTIL = @DSYMUTIL@ |
1688 | DUMPBIN = @DUMPBIN@ |
1689 | ECHO_C = @ECHO_C@ |
1690 | @@ -168,6 +201,7 @@ |
1691 | LTLIBOBJS = @LTLIBOBJS@ |
1692 | MAINT = @MAINT@ |
1693 | MAKEINFO = @MAKEINFO@ |
1694 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
1695 | MKDIR_P = @MKDIR_P@ |
1696 | NM = @NM@ |
1697 | NMEDIT = @NMEDIT@ |
1698 | @@ -194,6 +228,7 @@ |
1699 | abs_srcdir = @abs_srcdir@ |
1700 | abs_top_builddir = @abs_top_builddir@ |
1701 | abs_top_srcdir = @abs_top_srcdir@ |
1702 | +ac_ct_AR = @ac_ct_AR@ |
1703 | ac_ct_CC = @ac_ct_CC@ |
1704 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
1705 | am__include = @am__include@ |
1706 | @@ -226,7 +261,6 @@ |
1707 | libexecdir = @libexecdir@ |
1708 | localedir = @localedir@ |
1709 | localstatedir = @localstatedir@ |
1710 | -lt_ECHO = @lt_ECHO@ |
1711 | mandir = @mandir@ |
1712 | mkdir_p = @mkdir_p@ |
1713 | oldincludedir = @oldincludedir@ |
1714 | @@ -244,13 +278,13 @@ |
1715 | top_srcdir = @top_srcdir@ |
1716 | SUBDIRS = src tools |
1717 | pkgconfigdir = $(libdir)/pkgconfig |
1718 | -pkgconfig_DATA = utouch-evemu.pc |
1719 | +pkgconfig_DATA = evemu.pc |
1720 | INCLUDES = $(top_srcdir)/include/ |
1721 | all: config.h |
1722 | $(MAKE) $(AM_MAKEFLAGS) all-recursive |
1723 | |
1724 | .SUFFIXES: |
1725 | -am--refresh: |
1726 | +am--refresh: Makefile |
1727 | @: |
1728 | $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
1729 | @for dep in $?; do \ |
1730 | @@ -286,10 +320,8 @@ |
1731 | $(am__aclocal_m4_deps): |
1732 | |
1733 | config.h: stamp-h1 |
1734 | - @if test ! -f $@; then \ |
1735 | - rm -f stamp-h1; \ |
1736 | - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ |
1737 | - else :; fi |
1738 | + @if test ! -f $@; then rm -f stamp-h1; else :; fi |
1739 | + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi |
1740 | |
1741 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status |
1742 | @rm -f stamp-h1 |
1743 | @@ -301,7 +333,7 @@ |
1744 | |
1745 | distclean-hdr: |
1746 | -rm -f config.h stamp-h1 |
1747 | -utouch-evemu.pc: $(top_builddir)/config.status $(srcdir)/utouch-evemu.pc.in |
1748 | +evemu.pc: $(top_builddir)/config.status $(srcdir)/evemu.pc.in |
1749 | cd $(top_builddir) && $(SHELL) ./config.status $@ |
1750 | |
1751 | mostlyclean-libtool: |
1752 | @@ -314,8 +346,11 @@ |
1753 | -rm -f libtool config.lt |
1754 | install-pkgconfigDATA: $(pkgconfig_DATA) |
1755 | @$(NORMAL_INSTALL) |
1756 | - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" |
1757 | @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ |
1758 | + if test -n "$$list"; then \ |
1759 | + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ |
1760 | + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ |
1761 | + fi; \ |
1762 | for p in $$list; do \ |
1763 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
1764 | echo "$$d$$p"; \ |
1765 | @@ -329,9 +364,7 @@ |
1766 | @$(NORMAL_UNINSTALL) |
1767 | @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ |
1768 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
1769 | - test -n "$$files" || exit 0; \ |
1770 | - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ |
1771 | - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files |
1772 | + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) |
1773 | |
1774 | # This directory's subdirectories are mostly independent; you can cd |
1775 | # into them and run `make' without going through this Makefile. |
1776 | @@ -502,13 +535,10 @@ |
1777 | done |
1778 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
1779 | if test "$$subdir" = .; then :; else \ |
1780 | - test -d "$(distdir)/$$subdir" \ |
1781 | - || $(MKDIR_P) "$(distdir)/$$subdir" \ |
1782 | - || exit 1; \ |
1783 | - fi; \ |
1784 | - done |
1785 | - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
1786 | - if test "$$subdir" = .; then :; else \ |
1787 | + $(am__make_dryrun) \ |
1788 | + || test -d "$(distdir)/$$subdir" \ |
1789 | + || $(MKDIR_P) "$(distdir)/$$subdir" \ |
1790 | + || exit 1; \ |
1791 | dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
1792 | $(am__relativize); \ |
1793 | new_distdir=$$reldir; \ |
1794 | @@ -542,7 +572,11 @@ |
1795 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
1796 | $(am__remove_distdir) |
1797 | dist-bzip2: distdir |
1798 | - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
1799 | + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
1800 | + $(am__remove_distdir) |
1801 | + |
1802 | +dist-lzip: distdir |
1803 | + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz |
1804 | $(am__remove_distdir) |
1805 | |
1806 | dist-lzma: distdir |
1807 | @@ -550,7 +584,7 @@ |
1808 | $(am__remove_distdir) |
1809 | |
1810 | dist-xz: distdir |
1811 | - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz |
1812 | + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
1813 | $(am__remove_distdir) |
1814 | |
1815 | dist-tarZ: distdir |
1816 | @@ -568,7 +602,7 @@ |
1817 | |
1818 | dist dist-all: distdir |
1819 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
1820 | - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
1821 | + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
1822 | $(am__remove_distdir) |
1823 | |
1824 | # This target untars the dist file and tries a VPATH configuration. Then |
1825 | @@ -582,6 +616,8 @@ |
1826 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
1827 | *.tar.lzma*) \ |
1828 | lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
1829 | + *.tar.lz*) \ |
1830 | + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ |
1831 | *.tar.xz*) \ |
1832 | xz -dc $(distdir).tar.xz | $(am__untar) ;;\ |
1833 | *.tar.Z*) \ |
1834 | @@ -601,6 +637,7 @@ |
1835 | && am__cwd=`pwd` \ |
1836 | && $(am__cd) $(distdir)/_build \ |
1837 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
1838 | + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
1839 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
1840 | && $(MAKE) $(AM_MAKEFLAGS) \ |
1841 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
1842 | @@ -629,8 +666,16 @@ |
1843 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
1844 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
1845 | distuninstallcheck: |
1846 | - @$(am__cd) '$(distuninstallcheck_dir)' \ |
1847 | - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ |
1848 | + @test -n '$(distuninstallcheck_dir)' || { \ |
1849 | + echo 'ERROR: trying to run $@ with an empty' \ |
1850 | + '$$(distuninstallcheck_dir)' >&2; \ |
1851 | + exit 1; \ |
1852 | + }; \ |
1853 | + $(am__cd) '$(distuninstallcheck_dir)' || { \ |
1854 | + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ |
1855 | + exit 1; \ |
1856 | + }; \ |
1857 | + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ |
1858 | || { echo "ERROR: files left after uninstall:" ; \ |
1859 | if test -n "$(DESTDIR)"; then \ |
1860 | echo " (check DESTDIR support)"; \ |
1861 | @@ -664,10 +709,15 @@ |
1862 | |
1863 | installcheck: installcheck-recursive |
1864 | install-strip: |
1865 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1866 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1867 | - `test -z '$(STRIP)' || \ |
1868 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
1869 | + if test -z '$(STRIP)'; then \ |
1870 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1871 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1872 | + install; \ |
1873 | + else \ |
1874 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1875 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1876 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
1877 | + fi |
1878 | mostlyclean-generic: |
1879 | |
1880 | clean-generic: |
1881 | @@ -755,16 +805,16 @@ |
1882 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
1883 | all all-am am--refresh check check-am clean clean-generic \ |
1884 | clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ |
1885 | - dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \ |
1886 | - dist-zip distcheck distclean distclean-generic distclean-hdr \ |
1887 | - distclean-libtool distclean-tags distcleancheck distdir \ |
1888 | - distuninstallcheck dvi dvi-am html html-am info info-am \ |
1889 | - install install-am install-data install-data-am install-dvi \ |
1890 | - install-dvi-am install-exec install-exec-am install-html \ |
1891 | - install-html-am install-info install-info-am install-man \ |
1892 | - install-pdf install-pdf-am install-pkgconfigDATA install-ps \ |
1893 | - install-ps-am install-strip installcheck installcheck-am \ |
1894 | - installdirs installdirs-am maintainer-clean \ |
1895 | + dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \ |
1896 | + dist-xz dist-zip distcheck distclean distclean-generic \ |
1897 | + distclean-hdr distclean-libtool distclean-tags distcleancheck \ |
1898 | + distdir distuninstallcheck dvi dvi-am html html-am info \ |
1899 | + info-am install install-am install-data install-data-am \ |
1900 | + install-dvi install-dvi-am install-exec install-exec-am \ |
1901 | + install-html install-html-am install-info install-info-am \ |
1902 | + install-man install-pdf install-pdf-am install-pkgconfigDATA \ |
1903 | + install-ps install-ps-am install-strip installcheck \ |
1904 | + installcheck-am installdirs installdirs-am maintainer-clean \ |
1905 | maintainer-clean-generic mostlyclean mostlyclean-generic \ |
1906 | mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ |
1907 | uninstall uninstall-am uninstall-pkgconfigDATA |
1908 | |
1909 | === added file 'README' |
1910 | --- README 1970-01-01 00:00:00 +0000 |
1911 | +++ README 2012-08-20 20:53:20 +0000 |
1912 | @@ -0,0 +1,32 @@ |
1913 | +evemu - Kernel device emulation |
1914 | + |
1915 | +The evemu library and tools are used to describe devices, record |
1916 | +data, create devices and replay data from kernel evdev devices. |
1917 | + |
1918 | +http://bitmath.org/code/evemu/ |
1919 | +Please send patches to: patches@bitmath.org |
1920 | + |
1921 | +evemu produces two different data formats, one for the device description |
1922 | +and one for the device event data. hex data is without a 0x prefix. |
1923 | + |
1924 | +Device Description Format: |
1925 | + N: <device name> |
1926 | + I: <bustype (hex)> <vendor (hex)> <product (hex)> <version (hex)> |
1927 | + # for each kernel property (2.3.38 only) |
1928 | + P: <byte 0 (hex)> <byte 1 (hex)> ... <byte 7 (hex)> |
1929 | + P: <byte 8 (hex)> ... |
1930 | + # for each index from 0 to EV_CNT |
1931 | + B: <index (hex)> <byte 0 (hex)> <byte 1 (hex)> ... <byte 7 (hex)> |
1932 | + B: <index (hex)> <byte 8 (hex)> ... |
1933 | + # for each absolute axis |
1934 | + A: <index (hex)> <min> <max> <fuzz> <flat> |
1935 | + |
1936 | + |
1937 | +Event Data Format: |
1938 | + E: <sec>.<usec> <evtype (hex)> <evcode (hex)> <ev value> |
1939 | +where type, code and value are the respective fields of the |
1940 | +input_event struct defined in linux/input.h |
1941 | + |
1942 | +--- |
1943 | +Copyright (C) 2010 Henrik Rydberg <rydberg@euromail.se> |
1944 | +Copyright (C) 2010 Canonical Ltd. |
1945 | |
1946 | === removed file 'README' |
1947 | --- README 2011-01-05 10:58:59 +0000 |
1948 | +++ README 1970-01-01 00:00:00 +0000 |
1949 | @@ -1,32 +0,0 @@ |
1950 | -evemu - Kernel device emulation |
1951 | - |
1952 | -The evemu library and tools are used to describe devices, record |
1953 | -data, create devices and replay data from kernel evdev devices. |
1954 | - |
1955 | -http://bitmath.org/code/evemu/ |
1956 | -Please send patches to: patches@bitmath.org |
1957 | - |
1958 | -evemu produces two different data formats, one for the device description |
1959 | -and one for the device event data. hex data is without a 0x prefix. |
1960 | - |
1961 | -Device Description Format: |
1962 | - N: <device name> |
1963 | - I: <bustype (hex)> <vendor (hex)> <product (hex)> <version (hex)> |
1964 | - # for each kernel property (2.3.38 only) |
1965 | - P: <byte 0 (hex)> <byte 1 (hex)> ... <byte 7 (hex)> |
1966 | - P: <byte 8 (hex)> ... |
1967 | - # for each index from 0 to EV_CNT |
1968 | - B: <index (hex)> <byte 0 (hex)> <byte 1 (hex)> ... <byte 7 (hex)> |
1969 | - B: <index (hex)> <byte 8 (hex)> ... |
1970 | - # for each absolute axis |
1971 | - A: <index (hex)> <min> <max> <fuzz> <flat> |
1972 | - |
1973 | - |
1974 | -Event Data Format: |
1975 | - E: <sec>.<usec> <evtype (hex)> <evcode (hex)> <ev value> |
1976 | -where type, code and value are the respective fields of the |
1977 | -input_event struct defined in linux/input.h |
1978 | - |
1979 | ---- |
1980 | -Copyright (C) 2010 Henrik Rydberg <rydberg@euromail.se> |
1981 | -Copyright (C) 2010 Canonical Ltd. |
1982 | |
1983 | === modified file 'aclocal.m4' |
1984 | --- aclocal.m4 2010-12-22 08:47:30 +0000 |
1985 | +++ aclocal.m4 2012-08-20 20:53:20 +0000 |
1986 | @@ -1,7 +1,8 @@ |
1987 | -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- |
1988 | +# generated automatically by aclocal 1.11.5 -*- Autoconf -*- |
1989 | |
1990 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
1991 | -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
1992 | +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, |
1993 | +# Inc. |
1994 | # This file is free software; the Free Software Foundation |
1995 | # gives unlimited permission to copy and/or distribute it, |
1996 | # with or without modifications, as long as this notice is preserved. |
1997 | @@ -13,8 +14,8 @@ |
1998 | |
1999 | m4_ifndef([AC_AUTOCONF_VERSION], |
2000 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
2001 | -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, |
2002 | -[m4_warning([this file was generated for autoconf 2.67. |
2003 | +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, |
2004 | +[m4_warning([this file was generated for autoconf 2.69. |
2005 | You have another version of autoconf. It may work, but is not guaranteed to. |
2006 | If you have problems, you may need to regenerate the build system entirely. |
2007 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
2008 | @@ -22,7 +23,8 @@ |
2009 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
2010 | # |
2011 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
2012 | -# 2006, 2007, 2008 Free Software Foundation, Inc. |
2013 | +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
2014 | +# Foundation, Inc. |
2015 | # Written by Gordon Matzigkeit, 1996 |
2016 | # |
2017 | # This file is free software; the Free Software Foundation gives |
2018 | @@ -31,7 +33,8 @@ |
2019 | |
2020 | m4_define([_LT_COPYING], [dnl |
2021 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
2022 | -# 2006, 2007, 2008 Free Software Foundation, Inc. |
2023 | +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
2024 | +# Foundation, Inc. |
2025 | # Written by Gordon Matzigkeit, 1996 |
2026 | # |
2027 | # This file is part of GNU Libtool. |
2028 | @@ -58,7 +61,7 @@ |
2029 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
2030 | ]) |
2031 | |
2032 | -# serial 56 LT_INIT |
2033 | +# serial 57 LT_INIT |
2034 | |
2035 | |
2036 | # LT_PREREQ(VERSION) |
2037 | @@ -87,6 +90,7 @@ |
2038 | # ------------------ |
2039 | AC_DEFUN([LT_INIT], |
2040 | [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT |
2041 | +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl |
2042 | AC_BEFORE([$0], [LT_LANG])dnl |
2043 | AC_BEFORE([$0], [LT_OUTPUT])dnl |
2044 | AC_BEFORE([$0], [LTDL_INIT])dnl |
2045 | @@ -103,6 +107,8 @@ |
2046 | AC_REQUIRE([LTOBSOLETE_VERSION])dnl |
2047 | m4_require([_LT_PROG_LTMAIN])dnl |
2048 | |
2049 | +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) |
2050 | + |
2051 | dnl Parse OPTIONS |
2052 | _LT_SET_OPTIONS([$0], [$1]) |
2053 | |
2054 | @@ -139,7 +145,7 @@ |
2055 | *) break;; |
2056 | esac |
2057 | done |
2058 | -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
2059 | +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` |
2060 | ]) |
2061 | |
2062 | |
2063 | @@ -159,6 +165,11 @@ |
2064 | m4_defun([_LT_SETUP], |
2065 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
2066 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
2067 | +AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl |
2068 | +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl |
2069 | + |
2070 | +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl |
2071 | +dnl |
2072 | _LT_DECL([], [host_alias], [0], [The host system])dnl |
2073 | _LT_DECL([], [host], [0])dnl |
2074 | _LT_DECL([], [host_os], [0])dnl |
2075 | @@ -181,10 +192,13 @@ |
2076 | dnl |
2077 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
2078 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl |
2079 | +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl |
2080 | m4_require([_LT_CMD_RELOAD])dnl |
2081 | m4_require([_LT_CHECK_MAGIC_METHOD])dnl |
2082 | +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl |
2083 | m4_require([_LT_CMD_OLD_ARCHIVE])dnl |
2084 | m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl |
2085 | +m4_require([_LT_WITH_SYSROOT])dnl |
2086 | |
2087 | _LT_CONFIG_LIBTOOL_INIT([ |
2088 | # See if we are running on zsh, and set the options which allow our |
2089 | @@ -200,7 +214,6 @@ |
2090 | _LT_CHECK_OBJDIR |
2091 | |
2092 | m4_require([_LT_TAG_COMPILER])dnl |
2093 | -_LT_PROG_ECHO_BACKSLASH |
2094 | |
2095 | case $host_os in |
2096 | aix3*) |
2097 | @@ -214,23 +227,6 @@ |
2098 | ;; |
2099 | esac |
2100 | |
2101 | -# Sed substitution that helps us do robust quoting. It backslashifies |
2102 | -# metacharacters that are still active within double-quoted strings. |
2103 | -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' |
2104 | - |
2105 | -# Same as above, but do not quote variable references. |
2106 | -double_quote_subst='s/\([["`\\]]\)/\\\1/g' |
2107 | - |
2108 | -# Sed substitution to delay expansion of an escaped shell variable in a |
2109 | -# double_quote_subst'ed string. |
2110 | -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' |
2111 | - |
2112 | -# Sed substitution to delay expansion of an escaped single quote. |
2113 | -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' |
2114 | - |
2115 | -# Sed substitution to avoid accidental globbing in evaled expressions |
2116 | -no_glob_subst='s/\*/\\\*/g' |
2117 | - |
2118 | # Global variables: |
2119 | ofile=libtool |
2120 | can_build_shared=yes |
2121 | @@ -271,6 +267,28 @@ |
2122 | ])# _LT_SETUP |
2123 | |
2124 | |
2125 | +# _LT_PREPARE_SED_QUOTE_VARS |
2126 | +# -------------------------- |
2127 | +# Define a few sed substitution that help us do robust quoting. |
2128 | +m4_defun([_LT_PREPARE_SED_QUOTE_VARS], |
2129 | +[# Backslashify metacharacters that are still active within |
2130 | +# double-quoted strings. |
2131 | +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' |
2132 | + |
2133 | +# Same as above, but do not quote variable references. |
2134 | +double_quote_subst='s/\([["`\\]]\)/\\\1/g' |
2135 | + |
2136 | +# Sed substitution to delay expansion of an escaped shell variable in a |
2137 | +# double_quote_subst'ed string. |
2138 | +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' |
2139 | + |
2140 | +# Sed substitution to delay expansion of an escaped single quote. |
2141 | +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' |
2142 | + |
2143 | +# Sed substitution to avoid accidental globbing in evaled expressions |
2144 | +no_glob_subst='s/\*/\\\*/g' |
2145 | +]) |
2146 | + |
2147 | # _LT_PROG_LTMAIN |
2148 | # --------------- |
2149 | # Note that this code is called both from `configure', and `config.status' |
2150 | @@ -423,7 +441,7 @@ |
2151 | # declaration there will have the same value as in `configure'. VARNAME |
2152 | # must have a single quote delimited value for this to work. |
2153 | m4_define([_LT_CONFIG_STATUS_DECLARE], |
2154 | -[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) |
2155 | +[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) |
2156 | |
2157 | |
2158 | # _LT_CONFIG_STATUS_DECLARATIONS |
2159 | @@ -433,7 +451,7 @@ |
2160 | # embedded single quotes properly. In configure, this macro expands |
2161 | # each variable declared with _LT_DECL (and _LT_TAGDECL) into: |
2162 | # |
2163 | -# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`' |
2164 | +# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`' |
2165 | m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], |
2166 | [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), |
2167 | [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) |
2168 | @@ -532,12 +550,20 @@ |
2169 | LTCFLAGS='$LTCFLAGS' |
2170 | compiler='$compiler_DEFAULT' |
2171 | |
2172 | +# A function that is used when there is no print builtin or printf. |
2173 | +func_fallback_echo () |
2174 | +{ |
2175 | + eval 'cat <<_LTECHO_EOF |
2176 | +\$[]1 |
2177 | +_LTECHO_EOF' |
2178 | +} |
2179 | + |
2180 | # Quote evaled strings. |
2181 | for var in lt_decl_all_varnames([[ \ |
2182 | ]], lt_decl_quote_varnames); do |
2183 | - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in |
2184 | + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
2185 | *[[\\\\\\\`\\"\\\$]]*) |
2186 | - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" |
2187 | + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" |
2188 | ;; |
2189 | *) |
2190 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
2191 | @@ -548,9 +574,9 @@ |
2192 | # Double-quote double-evaled strings. |
2193 | for var in lt_decl_all_varnames([[ \ |
2194 | ]], lt_decl_dquote_varnames); do |
2195 | - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in |
2196 | + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
2197 | *[[\\\\\\\`\\"\\\$]]*) |
2198 | - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
2199 | + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
2200 | ;; |
2201 | *) |
2202 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
2203 | @@ -558,16 +584,38 @@ |
2204 | esac |
2205 | done |
2206 | |
2207 | -# Fix-up fallback echo if it was mangled by the above quoting rules. |
2208 | -case \$lt_ECHO in |
2209 | -*'\\\[$]0 --fallback-echo"')dnl " |
2210 | - lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` |
2211 | - ;; |
2212 | -esac |
2213 | - |
2214 | _LT_OUTPUT_LIBTOOL_INIT |
2215 | ]) |
2216 | |
2217 | +# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) |
2218 | +# ------------------------------------ |
2219 | +# Generate a child script FILE with all initialization necessary to |
2220 | +# reuse the environment learned by the parent script, and make the |
2221 | +# file executable. If COMMENT is supplied, it is inserted after the |
2222 | +# `#!' sequence but before initialization text begins. After this |
2223 | +# macro, additional text can be appended to FILE to form the body of |
2224 | +# the child script. The macro ends with non-zero status if the |
2225 | +# file could not be fully written (such as if the disk is full). |
2226 | +m4_ifdef([AS_INIT_GENERATED], |
2227 | +[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], |
2228 | +[m4_defun([_LT_GENERATED_FILE_INIT], |
2229 | +[m4_require([AS_PREPARE])]dnl |
2230 | +[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl |
2231 | +[lt_write_fail=0 |
2232 | +cat >$1 <<_ASEOF || lt_write_fail=1 |
2233 | +#! $SHELL |
2234 | +# Generated by $as_me. |
2235 | +$2 |
2236 | +SHELL=\${CONFIG_SHELL-$SHELL} |
2237 | +export SHELL |
2238 | +_ASEOF |
2239 | +cat >>$1 <<\_ASEOF || lt_write_fail=1 |
2240 | +AS_SHELL_SANITIZE |
2241 | +_AS_PREPARE |
2242 | +exec AS_MESSAGE_FD>&1 |
2243 | +_ASEOF |
2244 | +test $lt_write_fail = 0 && chmod +x $1[]dnl |
2245 | +m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT |
2246 | |
2247 | # LT_OUTPUT |
2248 | # --------- |
2249 | @@ -577,20 +625,11 @@ |
2250 | AC_DEFUN([LT_OUTPUT], |
2251 | [: ${CONFIG_LT=./config.lt} |
2252 | AC_MSG_NOTICE([creating $CONFIG_LT]) |
2253 | -cat >"$CONFIG_LT" <<_LTEOF |
2254 | -#! $SHELL |
2255 | -# Generated by $as_me. |
2256 | -# Run this file to recreate a libtool stub with the current configuration. |
2257 | +_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], |
2258 | +[# Run this file to recreate a libtool stub with the current configuration.]) |
2259 | |
2260 | +cat >>"$CONFIG_LT" <<\_LTEOF |
2261 | lt_cl_silent=false |
2262 | -SHELL=\${CONFIG_SHELL-$SHELL} |
2263 | -_LTEOF |
2264 | - |
2265 | -cat >>"$CONFIG_LT" <<\_LTEOF |
2266 | -AS_SHELL_SANITIZE |
2267 | -_AS_PREPARE |
2268 | - |
2269 | -exec AS_MESSAGE_FD>&1 |
2270 | exec AS_MESSAGE_LOG_FD>>config.log |
2271 | { |
2272 | echo |
2273 | @@ -616,7 +655,7 @@ |
2274 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
2275 | configured by $[0], generated by m4_PACKAGE_STRING. |
2276 | |
2277 | -Copyright (C) 2008 Free Software Foundation, Inc. |
2278 | +Copyright (C) 2011 Free Software Foundation, Inc. |
2279 | This config.lt script is free software; the Free Software Foundation |
2280 | gives unlimited permision to copy, distribute and modify it." |
2281 | |
2282 | @@ -661,15 +700,13 @@ |
2283 | # appending to config.log, which fails on DOS, as config.log is still kept |
2284 | # open by configure. Here we exec the FD to /dev/null, effectively closing |
2285 | # config.log, so it can be properly (re)opened and appended to by config.lt. |
2286 | -if test "$no_create" != yes; then |
2287 | - lt_cl_success=: |
2288 | - test "$silent" = yes && |
2289 | - lt_config_lt_args="$lt_config_lt_args --quiet" |
2290 | - exec AS_MESSAGE_LOG_FD>/dev/null |
2291 | - $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false |
2292 | - exec AS_MESSAGE_LOG_FD>>config.log |
2293 | - $lt_cl_success || AS_EXIT(1) |
2294 | -fi |
2295 | +lt_cl_success=: |
2296 | +test "$silent" = yes && |
2297 | + lt_config_lt_args="$lt_config_lt_args --quiet" |
2298 | +exec AS_MESSAGE_LOG_FD>/dev/null |
2299 | +$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false |
2300 | +exec AS_MESSAGE_LOG_FD>>config.log |
2301 | +$lt_cl_success || AS_EXIT(1) |
2302 | ])# LT_OUTPUT |
2303 | |
2304 | |
2305 | @@ -732,15 +769,12 @@ |
2306 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
2307 | # text mode, it properly converts lines to CR/LF. This bash problem |
2308 | # is reportedly fixed, but why not run on old versions too? |
2309 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
2310 | - || (rm -f "$cfgfile"; exit 1) |
2311 | - |
2312 | - _LT_PROG_XSI_SHELLFNS |
2313 | - |
2314 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
2315 | - || (rm -f "$cfgfile"; exit 1) |
2316 | - |
2317 | - mv -f "$cfgfile" "$ofile" || |
2318 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
2319 | + || (rm -f "$cfgfile"; exit 1) |
2320 | + |
2321 | + _LT_PROG_REPLACE_SHELLFNS |
2322 | + |
2323 | + mv -f "$cfgfile" "$ofile" || |
2324 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
2325 | chmod +x "$ofile" |
2326 | ], |
2327 | @@ -785,6 +819,7 @@ |
2328 | m4_case([$1], |
2329 | [C], [_LT_LANG(C)], |
2330 | [C++], [_LT_LANG(CXX)], |
2331 | + [Go], [_LT_LANG(GO)], |
2332 | [Java], [_LT_LANG(GCJ)], |
2333 | [Fortran 77], [_LT_LANG(F77)], |
2334 | [Fortran], [_LT_LANG(FC)], |
2335 | @@ -806,6 +841,29 @@ |
2336 | ])# _LT_LANG |
2337 | |
2338 | |
2339 | +m4_ifndef([AC_PROG_GO], [ |
2340 | +# NOTE: This macro has been submitted for inclusion into # |
2341 | +# GNU Autoconf as AC_PROG_GO. When it is available in # |
2342 | +# a released version of Autoconf we should remove this # |
2343 | +# macro and use it instead. # |
2344 | +m4_defun([AC_PROG_GO], |
2345 | +[AC_LANG_PUSH(Go)dnl |
2346 | +AC_ARG_VAR([GOC], [Go compiler command])dnl |
2347 | +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl |
2348 | +_AC_ARG_VAR_LDFLAGS()dnl |
2349 | +AC_CHECK_TOOL(GOC, gccgo) |
2350 | +if test -z "$GOC"; then |
2351 | + if test -n "$ac_tool_prefix"; then |
2352 | + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) |
2353 | + fi |
2354 | +fi |
2355 | +if test -z "$GOC"; then |
2356 | + AC_CHECK_PROG(GOC, gccgo, gccgo, false) |
2357 | +fi |
2358 | +])#m4_defun |
2359 | +])#m4_ifndef |
2360 | + |
2361 | + |
2362 | # _LT_LANG_DEFAULT_CONFIG |
2363 | # ----------------------- |
2364 | m4_defun([_LT_LANG_DEFAULT_CONFIG], |
2365 | @@ -836,6 +894,10 @@ |
2366 | m4_ifdef([LT_PROG_GCJ], |
2367 | [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) |
2368 | |
2369 | +AC_PROVIDE_IFELSE([AC_PROG_GO], |
2370 | + [LT_LANG(GO)], |
2371 | + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) |
2372 | + |
2373 | AC_PROVIDE_IFELSE([LT_PROG_RC], |
2374 | [LT_LANG(RC)], |
2375 | [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) |
2376 | @@ -846,11 +908,13 @@ |
2377 | AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) |
2378 | AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) |
2379 | AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) |
2380 | +AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) |
2381 | dnl aclocal-1.4 backwards compatibility: |
2382 | dnl AC_DEFUN([AC_LIBTOOL_CXX], []) |
2383 | dnl AC_DEFUN([AC_LIBTOOL_F77], []) |
2384 | dnl AC_DEFUN([AC_LIBTOOL_FC], []) |
2385 | dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) |
2386 | +dnl AC_DEFUN([AC_LIBTOOL_RC], []) |
2387 | |
2388 | |
2389 | # _LT_TAG_COMPILER |
2390 | @@ -936,7 +1000,13 @@ |
2391 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
2392 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err |
2393 | _lt_result=$? |
2394 | - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then |
2395 | + # If there is a non-empty error log, and "single_module" |
2396 | + # appears in it, assume the flag caused a linker warning |
2397 | + if test -s conftest.err && $GREP single_module conftest.err; then |
2398 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
2399 | + # Otherwise, if the output was created with a 0 exit code from |
2400 | + # the compiler, it worked. |
2401 | + elif test -f libconftest.dylib && test $_lt_result -eq 0; then |
2402 | lt_cv_apple_cc_single_mod=yes |
2403 | else |
2404 | cat conftest.err >&AS_MESSAGE_LOG_FD |
2405 | @@ -944,6 +1014,7 @@ |
2406 | rm -rf libconftest.dylib* |
2407 | rm -f conftest.* |
2408 | fi]) |
2409 | + |
2410 | AC_CACHE_CHECK([for -exported_symbols_list linker flag], |
2411 | [lt_cv_ld_exported_symbols_list], |
2412 | [lt_cv_ld_exported_symbols_list=no |
2413 | @@ -955,6 +1026,34 @@ |
2414 | [lt_cv_ld_exported_symbols_list=no]) |
2415 | LDFLAGS="$save_LDFLAGS" |
2416 | ]) |
2417 | + |
2418 | + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], |
2419 | + [lt_cv_ld_force_load=no |
2420 | + cat > conftest.c << _LT_EOF |
2421 | +int forced_loaded() { return 2;} |
2422 | +_LT_EOF |
2423 | + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD |
2424 | + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD |
2425 | + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD |
2426 | + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD |
2427 | + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD |
2428 | + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD |
2429 | + cat > conftest.c << _LT_EOF |
2430 | +int main() { return 0;} |
2431 | +_LT_EOF |
2432 | + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD |
2433 | + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err |
2434 | + _lt_result=$? |
2435 | + if test -s conftest.err && $GREP force_load conftest.err; then |
2436 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
2437 | + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then |
2438 | + lt_cv_ld_force_load=yes |
2439 | + else |
2440 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
2441 | + fi |
2442 | + rm -f conftest.err libconftest.a conftest conftest.c |
2443 | + rm -rf conftest.dSYM |
2444 | + ]) |
2445 | case $host_os in |
2446 | rhapsody* | darwin1.[[012]]) |
2447 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; |
2448 | @@ -982,7 +1081,7 @@ |
2449 | else |
2450 | _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' |
2451 | fi |
2452 | - if test "$DSYMUTIL" != ":"; then |
2453 | + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then |
2454 | _lt_dsymutil='~$DSYMUTIL $lib || :' |
2455 | else |
2456 | _lt_dsymutil= |
2457 | @@ -992,8 +1091,8 @@ |
2458 | ]) |
2459 | |
2460 | |
2461 | -# _LT_DARWIN_LINKER_FEATURES |
2462 | -# -------------------------- |
2463 | +# _LT_DARWIN_LINKER_FEATURES([TAG]) |
2464 | +# --------------------------------- |
2465 | # Checks for linker and compiler features on darwin |
2466 | m4_defun([_LT_DARWIN_LINKER_FEATURES], |
2467 | [ |
2468 | @@ -1002,7 +1101,13 @@ |
2469 | _LT_TAGVAR(hardcode_direct, $1)=no |
2470 | _LT_TAGVAR(hardcode_automatic, $1)=yes |
2471 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
2472 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='' |
2473 | + if test "$lt_cv_ld_force_load" = "yes"; then |
2474 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' |
2475 | + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], |
2476 | + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) |
2477 | + else |
2478 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='' |
2479 | + fi |
2480 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
2481 | _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" |
2482 | case $cc_basename in |
2483 | @@ -1010,7 +1115,7 @@ |
2484 | *) _lt_dar_can_shared=$GCC ;; |
2485 | esac |
2486 | if test "$_lt_dar_can_shared" = "yes"; then |
2487 | - output_verbose_link_cmd=echo |
2488 | + output_verbose_link_cmd=func_echo_all |
2489 | _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" |
2490 | _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" |
2491 | _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" |
2492 | @@ -1026,203 +1131,142 @@ |
2493 | fi |
2494 | ]) |
2495 | |
2496 | -# _LT_SYS_MODULE_PATH_AIX |
2497 | -# ----------------------- |
2498 | +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) |
2499 | +# ---------------------------------- |
2500 | # Links a minimal program and checks the executable |
2501 | # for the system default hardcoded library path. In most cases, |
2502 | # this is /usr/lib:/lib, but when the MPI compilers are used |
2503 | # the location of the communication and MPI libs are included too. |
2504 | # If we don't find anything, use the default library path according |
2505 | # to the aix ld manual. |
2506 | +# Store the results from the different compilers for each TAGNAME. |
2507 | +# Allow to override them for all tags through lt_cv_aix_libpath. |
2508 | m4_defun([_LT_SYS_MODULE_PATH_AIX], |
2509 | [m4_require([_LT_DECL_SED])dnl |
2510 | -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ |
2511 | -lt_aix_libpath_sed=' |
2512 | - /Import File Strings/,/^$/ { |
2513 | - /^0/ { |
2514 | - s/^0 *\(.*\)$/\1/ |
2515 | - p |
2516 | - } |
2517 | - }' |
2518 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
2519 | -# Check for a 64-bit object if we didn't find anything. |
2520 | -if test -z "$aix_libpath"; then |
2521 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
2522 | -fi],[]) |
2523 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
2524 | +if test "${lt_cv_aix_libpath+set}" = set; then |
2525 | + aix_libpath=$lt_cv_aix_libpath |
2526 | +else |
2527 | + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], |
2528 | + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ |
2529 | + lt_aix_libpath_sed='[ |
2530 | + /Import File Strings/,/^$/ { |
2531 | + /^0/ { |
2532 | + s/^0 *\([^ ]*\) *$/\1/ |
2533 | + p |
2534 | + } |
2535 | + }]' |
2536 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
2537 | + # Check for a 64-bit object if we didn't find anything. |
2538 | + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then |
2539 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
2540 | + fi],[]) |
2541 | + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then |
2542 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" |
2543 | + fi |
2544 | + ]) |
2545 | + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) |
2546 | +fi |
2547 | ])# _LT_SYS_MODULE_PATH_AIX |
2548 | |
2549 | |
2550 | # _LT_SHELL_INIT(ARG) |
2551 | # ------------------- |
2552 | m4_define([_LT_SHELL_INIT], |
2553 | -[ifdef([AC_DIVERSION_NOTICE], |
2554 | - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], |
2555 | - [AC_DIVERT_PUSH(NOTICE)]) |
2556 | -$1 |
2557 | -AC_DIVERT_POP |
2558 | -])# _LT_SHELL_INIT |
2559 | +[m4_divert_text([M4SH-INIT], [$1 |
2560 | +])])# _LT_SHELL_INIT |
2561 | + |
2562 | |
2563 | |
2564 | # _LT_PROG_ECHO_BACKSLASH |
2565 | # ----------------------- |
2566 | -# Add some code to the start of the generated configure script which |
2567 | -# will find an echo command which doesn't interpret backslashes. |
2568 | +# Find how we can fake an echo command that does not interpret backslash. |
2569 | +# In particular, with Autoconf 2.60 or later we add some code to the start |
2570 | +# of the generated configure script which will find a shell with a builtin |
2571 | +# printf (which we can use as an echo command). |
2572 | m4_defun([_LT_PROG_ECHO_BACKSLASH], |
2573 | -[_LT_SHELL_INIT([ |
2574 | -# Check that we are running under the correct shell. |
2575 | -SHELL=${CONFIG_SHELL-/bin/sh} |
2576 | - |
2577 | -case X$lt_ECHO in |
2578 | -X*--fallback-echo) |
2579 | - # Remove one level of quotation (which was required for Make). |
2580 | - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` |
2581 | - ;; |
2582 | +[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
2583 | +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO |
2584 | +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
2585 | + |
2586 | +AC_MSG_CHECKING([how to print strings]) |
2587 | +# Test print first, because it will be a builtin if present. |
2588 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
2589 | + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
2590 | + ECHO='print -r --' |
2591 | +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
2592 | + ECHO='printf %s\n' |
2593 | +else |
2594 | + # Use this function as a fallback that always works. |
2595 | + func_fallback_echo () |
2596 | + { |
2597 | + eval 'cat <<_LTECHO_EOF |
2598 | +$[]1 |
2599 | +_LTECHO_EOF' |
2600 | + } |
2601 | + ECHO='func_fallback_echo' |
2602 | +fi |
2603 | + |
2604 | +# func_echo_all arg... |
2605 | +# Invoke $ECHO with all args, space-separated. |
2606 | +func_echo_all () |
2607 | +{ |
2608 | + $ECHO "$*" |
2609 | +} |
2610 | + |
2611 | +case "$ECHO" in |
2612 | + printf*) AC_MSG_RESULT([printf]) ;; |
2613 | + print*) AC_MSG_RESULT([print -r]) ;; |
2614 | + *) AC_MSG_RESULT([cat]) ;; |
2615 | esac |
2616 | |
2617 | -ECHO=${lt_ECHO-echo} |
2618 | -if test "X[$]1" = X--no-reexec; then |
2619 | - # Discard the --no-reexec flag, and continue. |
2620 | - shift |
2621 | -elif test "X[$]1" = X--fallback-echo; then |
2622 | - # Avoid inline document here, it may be left over |
2623 | - : |
2624 | -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then |
2625 | - # Yippee, $ECHO works! |
2626 | - : |
2627 | -else |
2628 | - # Restart under the correct shell. |
2629 | - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} |
2630 | -fi |
2631 | - |
2632 | -if test "X[$]1" = X--fallback-echo; then |
2633 | - # used as fallback echo |
2634 | - shift |
2635 | - cat <<_LT_EOF |
2636 | -[$]* |
2637 | -_LT_EOF |
2638 | - exit 0 |
2639 | -fi |
2640 | - |
2641 | -# The HP-UX ksh and POSIX shell print the target directory to stdout |
2642 | -# if CDPATH is set. |
2643 | -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
2644 | - |
2645 | -if test -z "$lt_ECHO"; then |
2646 | - if test "X${echo_test_string+set}" != Xset; then |
2647 | - # find a string as large as possible, as long as the shell can cope with it |
2648 | - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do |
2649 | - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... |
2650 | - if { echo_test_string=`eval $cmd`; } 2>/dev/null && |
2651 | - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null |
2652 | - then |
2653 | - break |
2654 | - fi |
2655 | - done |
2656 | - fi |
2657 | - |
2658 | - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && |
2659 | - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && |
2660 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2661 | - : |
2662 | - else |
2663 | - # The Solaris, AIX, and Digital Unix default echo programs unquote |
2664 | - # backslashes. This makes it impossible to quote backslashes using |
2665 | - # echo "$something" | sed 's/\\/\\\\/g' |
2666 | - # |
2667 | - # So, first we look for a working echo in the user's PATH. |
2668 | - |
2669 | - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
2670 | - for dir in $PATH /usr/ucb; do |
2671 | - IFS="$lt_save_ifs" |
2672 | - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && |
2673 | - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && |
2674 | - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && |
2675 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2676 | - ECHO="$dir/echo" |
2677 | - break |
2678 | - fi |
2679 | - done |
2680 | - IFS="$lt_save_ifs" |
2681 | - |
2682 | - if test "X$ECHO" = Xecho; then |
2683 | - # We didn't find a better echo, so look for alternatives. |
2684 | - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && |
2685 | - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && |
2686 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2687 | - # This shell has a builtin print -r that does the trick. |
2688 | - ECHO='print -r' |
2689 | - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && |
2690 | - test "X$CONFIG_SHELL" != X/bin/ksh; then |
2691 | - # If we have ksh, try running configure again with it. |
2692 | - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} |
2693 | - export ORIGINAL_CONFIG_SHELL |
2694 | - CONFIG_SHELL=/bin/ksh |
2695 | - export CONFIG_SHELL |
2696 | - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} |
2697 | - else |
2698 | - # Try using printf. |
2699 | - ECHO='printf %s\n' |
2700 | - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && |
2701 | - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && |
2702 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2703 | - # Cool, printf works |
2704 | - : |
2705 | - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && |
2706 | - test "X$echo_testing_string" = 'X\t' && |
2707 | - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
2708 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2709 | - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL |
2710 | - export CONFIG_SHELL |
2711 | - SHELL="$CONFIG_SHELL" |
2712 | - export SHELL |
2713 | - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" |
2714 | - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && |
2715 | - test "X$echo_testing_string" = 'X\t' && |
2716 | - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
2717 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2718 | - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" |
2719 | - else |
2720 | - # maybe with a smaller string... |
2721 | - prev=: |
2722 | - |
2723 | - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do |
2724 | - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null |
2725 | - then |
2726 | - break |
2727 | - fi |
2728 | - prev="$cmd" |
2729 | - done |
2730 | - |
2731 | - if test "$prev" != 'sed 50q "[$]0"'; then |
2732 | - echo_test_string=`eval $prev` |
2733 | - export echo_test_string |
2734 | - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} |
2735 | - else |
2736 | - # Oops. We lost completely, so just stick with echo. |
2737 | - ECHO=echo |
2738 | - fi |
2739 | - fi |
2740 | - fi |
2741 | - fi |
2742 | - fi |
2743 | -fi |
2744 | - |
2745 | -# Copy echo and quote the copy suitably for passing to libtool from |
2746 | -# the Makefile, instead of quoting the original, which is used later. |
2747 | -lt_ECHO=$ECHO |
2748 | -if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then |
2749 | - lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" |
2750 | -fi |
2751 | - |
2752 | -AC_SUBST(lt_ECHO) |
2753 | -]) |
2754 | +m4_ifdef([_AS_DETECT_SUGGESTED], |
2755 | +[_AS_DETECT_SUGGESTED([ |
2756 | + test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( |
2757 | + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
2758 | + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO |
2759 | + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
2760 | + PATH=/empty FPATH=/empty; export PATH FPATH |
2761 | + test "X`printf %s $ECHO`" = "X$ECHO" \ |
2762 | + || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) |
2763 | + |
2764 | _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) |
2765 | -_LT_DECL([], [ECHO], [1], |
2766 | - [An echo program that does not interpret backslashes]) |
2767 | +_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) |
2768 | ])# _LT_PROG_ECHO_BACKSLASH |
2769 | |
2770 | |
2771 | +# _LT_WITH_SYSROOT |
2772 | +# ---------------- |
2773 | +AC_DEFUN([_LT_WITH_SYSROOT], |
2774 | +[AC_MSG_CHECKING([for sysroot]) |
2775 | +AC_ARG_WITH([sysroot], |
2776 | +[ --with-sysroot[=DIR] Search for dependent libraries within DIR |
2777 | + (or the compiler's sysroot if not specified).], |
2778 | +[], [with_sysroot=no]) |
2779 | + |
2780 | +dnl lt_sysroot will always be passed unquoted. We quote it here |
2781 | +dnl in case the user passed a directory name. |
2782 | +lt_sysroot= |
2783 | +case ${with_sysroot} in #( |
2784 | + yes) |
2785 | + if test "$GCC" = yes; then |
2786 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
2787 | + fi |
2788 | + ;; #( |
2789 | + /*) |
2790 | + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` |
2791 | + ;; #( |
2792 | + no|'') |
2793 | + ;; #( |
2794 | + *) |
2795 | + AC_MSG_RESULT([${with_sysroot}]) |
2796 | + AC_MSG_ERROR([The sysroot must be an absolute path.]) |
2797 | + ;; |
2798 | +esac |
2799 | + |
2800 | + AC_MSG_RESULT([${lt_sysroot:-no}]) |
2801 | +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl |
2802 | +[dependent libraries, and in which our libraries should be installed.])]) |
2803 | + |
2804 | # _LT_ENABLE_LOCK |
2805 | # --------------- |
2806 | m4_defun([_LT_ENABLE_LOCK], |
2807 | @@ -1251,7 +1295,7 @@ |
2808 | ;; |
2809 | *-*-irix6*) |
2810 | # Find out which ABI we are using. |
2811 | - echo '[#]line __oline__ "configure"' > conftest.$ac_ext |
2812 | + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext |
2813 | if AC_TRY_EVAL(ac_compile); then |
2814 | if test "$lt_cv_prog_gnu_ld" = yes; then |
2815 | case `/usr/bin/file conftest.$ac_objext` in |
2816 | @@ -1344,14 +1388,27 @@ |
2817 | CFLAGS="$SAVE_CFLAGS" |
2818 | fi |
2819 | ;; |
2820 | -sparc*-*solaris*) |
2821 | +*-*solaris*) |
2822 | # Find out which ABI we are using. |
2823 | echo 'int i;' > conftest.$ac_ext |
2824 | if AC_TRY_EVAL(ac_compile); then |
2825 | case `/usr/bin/file conftest.o` in |
2826 | *64-bit*) |
2827 | case $lt_cv_prog_gnu_ld in |
2828 | - yes*) LD="${LD-ld} -m elf64_sparc" ;; |
2829 | + yes*) |
2830 | + case $host in |
2831 | + i?86-*-solaris*) |
2832 | + LD="${LD-ld} -m elf_x86_64" |
2833 | + ;; |
2834 | + sparc*-*-solaris*) |
2835 | + LD="${LD-ld} -m elf64_sparc" |
2836 | + ;; |
2837 | + esac |
2838 | + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. |
2839 | + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then |
2840 | + LD="${LD-ld}_sol2" |
2841 | + fi |
2842 | + ;; |
2843 | *) |
2844 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
2845 | LD="${LD-ld} -64" |
2846 | @@ -1369,14 +1426,47 @@ |
2847 | ])# _LT_ENABLE_LOCK |
2848 | |
2849 | |
2850 | +# _LT_PROG_AR |
2851 | +# ----------- |
2852 | +m4_defun([_LT_PROG_AR], |
2853 | +[AC_CHECK_TOOLS(AR, [ar], false) |
2854 | +: ${AR=ar} |
2855 | +: ${AR_FLAGS=cru} |
2856 | +_LT_DECL([], [AR], [1], [The archiver]) |
2857 | +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) |
2858 | + |
2859 | +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], |
2860 | + [lt_cv_ar_at_file=no |
2861 | + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], |
2862 | + [echo conftest.$ac_objext > conftest.lst |
2863 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' |
2864 | + AC_TRY_EVAL([lt_ar_try]) |
2865 | + if test "$ac_status" -eq 0; then |
2866 | + # Ensure the archiver fails upon bogus file names. |
2867 | + rm -f conftest.$ac_objext libconftest.a |
2868 | + AC_TRY_EVAL([lt_ar_try]) |
2869 | + if test "$ac_status" -ne 0; then |
2870 | + lt_cv_ar_at_file=@ |
2871 | + fi |
2872 | + fi |
2873 | + rm -f conftest.* libconftest.a |
2874 | + ]) |
2875 | + ]) |
2876 | + |
2877 | +if test "x$lt_cv_ar_at_file" = xno; then |
2878 | + archiver_list_spec= |
2879 | +else |
2880 | + archiver_list_spec=$lt_cv_ar_at_file |
2881 | +fi |
2882 | +_LT_DECL([], [archiver_list_spec], [1], |
2883 | + [How to feed a file listing to the archiver]) |
2884 | +])# _LT_PROG_AR |
2885 | + |
2886 | + |
2887 | # _LT_CMD_OLD_ARCHIVE |
2888 | # ------------------- |
2889 | m4_defun([_LT_CMD_OLD_ARCHIVE], |
2890 | -[AC_CHECK_TOOL(AR, ar, false) |
2891 | -test -z "$AR" && AR=ar |
2892 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
2893 | -_LT_DECL([], [AR], [1], [The archiver]) |
2894 | -_LT_DECL([], [AR_FLAGS], [1]) |
2895 | +[_LT_PROG_AR |
2896 | |
2897 | AC_CHECK_TOOL(STRIP, strip, :) |
2898 | test -z "$STRIP" && STRIP=: |
2899 | @@ -1395,18 +1485,27 @@ |
2900 | if test -n "$RANLIB"; then |
2901 | case $host_os in |
2902 | openbsd*) |
2903 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" |
2904 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" |
2905 | ;; |
2906 | *) |
2907 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" |
2908 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" |
2909 | ;; |
2910 | esac |
2911 | - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
2912 | + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" |
2913 | fi |
2914 | + |
2915 | +case $host_os in |
2916 | + darwin*) |
2917 | + lock_old_archive_extraction=yes ;; |
2918 | + *) |
2919 | + lock_old_archive_extraction=no ;; |
2920 | +esac |
2921 | _LT_DECL([], [old_postinstall_cmds], [2]) |
2922 | _LT_DECL([], [old_postuninstall_cmds], [2]) |
2923 | _LT_TAGDECL([], [old_archive_cmds], [2], |
2924 | [Commands used to build an old-style archive]) |
2925 | +_LT_DECL([], [lock_old_archive_extraction], [0], |
2926 | + [Whether to use a lock for old archive extraction]) |
2927 | ])# _LT_CMD_OLD_ARCHIVE |
2928 | |
2929 | |
2930 | @@ -1431,15 +1530,15 @@ |
2931 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
2932 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
2933 | -e 's:$: $lt_compiler_flag:'` |
2934 | - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
2935 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
2936 | (eval "$lt_compile" 2>conftest.err) |
2937 | ac_status=$? |
2938 | cat conftest.err >&AS_MESSAGE_LOG_FD |
2939 | - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
2940 | + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
2941 | if (exit $ac_status) && test -s "$ac_outfile"; then |
2942 | # The compiler can only warn and ignore the option if not recognized |
2943 | # So say no if there are warnings other than the usual output. |
2944 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp |
2945 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp |
2946 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
2947 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
2948 | $2=yes |
2949 | @@ -1479,7 +1578,7 @@ |
2950 | if test -s conftest.err; then |
2951 | # Append any errors to the config.log. |
2952 | cat conftest.err 1>&AS_MESSAGE_LOG_FD |
2953 | - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp |
2954 | + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp |
2955 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
2956 | if diff conftest.exp conftest.er2 >/dev/null; then |
2957 | $2=yes |
2958 | @@ -1542,6 +1641,11 @@ |
2959 | lt_cv_sys_max_cmd_len=8192; |
2960 | ;; |
2961 | |
2962 | + mint*) |
2963 | + # On MiNT this can take a long time and run out of memory. |
2964 | + lt_cv_sys_max_cmd_len=8192; |
2965 | + ;; |
2966 | + |
2967 | amigaos*) |
2968 | # On AmigaOS with pdksh, this test takes hours, literally. |
2969 | # So we just punt and use a minimum line length of 8192. |
2970 | @@ -1567,6 +1671,11 @@ |
2971 | lt_cv_sys_max_cmd_len=196608 |
2972 | ;; |
2973 | |
2974 | + os2*) |
2975 | + # The test takes a long time on OS/2. |
2976 | + lt_cv_sys_max_cmd_len=8192 |
2977 | + ;; |
2978 | + |
2979 | osf*) |
2980 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
2981 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
2982 | @@ -1606,8 +1715,8 @@ |
2983 | # If test is not a shell built-in, we'll probably end up computing a |
2984 | # maximum length that is only half of the actual maximum length, but |
2985 | # we can't tell. |
2986 | - while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ |
2987 | - = "XX$teststring$teststring"; } >/dev/null 2>&1 && |
2988 | + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ |
2989 | + = "X$teststring$teststring"; } >/dev/null 2>&1 && |
2990 | test $i != 17 # 1/2 MB should be enough |
2991 | do |
2992 | i=`expr $i + 1` |
2993 | @@ -1658,7 +1767,7 @@ |
2994 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
2995 | lt_status=$lt_dlunknown |
2996 | cat > conftest.$ac_ext <<_LT_EOF |
2997 | -[#line __oline__ "configure" |
2998 | +[#line $LINENO "configure" |
2999 | #include "confdefs.h" |
3000 | |
3001 | #if HAVE_DLFCN_H |
3002 | @@ -1699,7 +1808,13 @@ |
3003 | # endif |
3004 | #endif |
3005 | |
3006 | -void fnord() { int i=42;} |
3007 | +/* When -fvisbility=hidden is used, assume the code has been annotated |
3008 | + correspondingly for the symbols needed. */ |
3009 | +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
3010 | +int fnord () __attribute__((visibility("default"))); |
3011 | +#endif |
3012 | + |
3013 | +int fnord () { return 42; } |
3014 | int main () |
3015 | { |
3016 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
3017 | @@ -1708,7 +1823,11 @@ |
3018 | if (self) |
3019 | { |
3020 | if (dlsym (self,"fnord")) status = $lt_dlno_uscore; |
3021 | - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
3022 | + else |
3023 | + { |
3024 | + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
3025 | + else puts (dlerror ()); |
3026 | + } |
3027 | /* dlclose (self); */ |
3028 | } |
3029 | else |
3030 | @@ -1884,16 +2003,16 @@ |
3031 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
3032 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
3033 | -e 's:$: $lt_compiler_flag:'` |
3034 | - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
3035 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
3036 | (eval "$lt_compile" 2>out/conftest.err) |
3037 | ac_status=$? |
3038 | cat out/conftest.err >&AS_MESSAGE_LOG_FD |
3039 | - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
3040 | + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
3041 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
3042 | then |
3043 | # The compiler can only warn and ignore the option if not recognized |
3044 | # So say no if there are warnings |
3045 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp |
3046 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp |
3047 | $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
3048 | if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then |
3049 | _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes |
3050 | @@ -2052,6 +2171,7 @@ |
3051 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
3052 | m4_require([_LT_DECL_OBJDUMP])dnl |
3053 | m4_require([_LT_DECL_SED])dnl |
3054 | +m4_require([_LT_CHECK_SHELL_FEATURES])dnl |
3055 | AC_MSG_CHECKING([dynamic linker characteristics]) |
3056 | m4_if([$1], |
3057 | [], [ |
3058 | @@ -2060,16 +2180,23 @@ |
3059 | darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; |
3060 | *) lt_awk_arg="/^libraries:/" ;; |
3061 | esac |
3062 | - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
3063 | - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then |
3064 | + case $host_os in |
3065 | + mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; |
3066 | + *) lt_sed_strip_eq="s,=/,/,g" ;; |
3067 | + esac |
3068 | + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` |
3069 | + case $lt_search_path_spec in |
3070 | + *\;*) |
3071 | # if the path contains ";" then we assume it to be the separator |
3072 | # otherwise default to the standard path separator (i.e. ":") - it is |
3073 | # assumed that no part of a normal pathname contains ";" but that should |
3074 | # okay in the real world where ";" in dirpaths is itself problematic. |
3075 | - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` |
3076 | - else |
3077 | - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
3078 | - fi |
3079 | + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` |
3080 | + ;; |
3081 | + *) |
3082 | + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` |
3083 | + ;; |
3084 | + esac |
3085 | # Ok, now we have the path, separated by spaces, we can step through it |
3086 | # and add multilib dir if necessary. |
3087 | lt_tmp_lt_search_path_spec= |
3088 | @@ -2082,7 +2209,7 @@ |
3089 | lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" |
3090 | fi |
3091 | done |
3092 | - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' |
3093 | + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' |
3094 | BEGIN {RS=" "; FS="/|\n";} { |
3095 | lt_foo=""; |
3096 | lt_count=0; |
3097 | @@ -2102,7 +2229,13 @@ |
3098 | if (lt_foo != "") { lt_freq[[lt_foo]]++; } |
3099 | if (lt_freq[[lt_foo]] == 1) { print lt_foo; } |
3100 | }'` |
3101 | - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` |
3102 | + # AWK program above erroneously prepends '/' to C:/dos/paths |
3103 | + # for these hosts. |
3104 | + case $host_os in |
3105 | + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ |
3106 | + $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; |
3107 | + esac |
3108 | + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` |
3109 | else |
3110 | sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" |
3111 | fi]) |
3112 | @@ -2128,7 +2261,7 @@ |
3113 | |
3114 | case $host_os in |
3115 | aix3*) |
3116 | - version_type=linux |
3117 | + version_type=linux # correct to gnu/linux during the next big refactor |
3118 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' |
3119 | shlibpath_var=LIBPATH |
3120 | |
3121 | @@ -2137,7 +2270,7 @@ |
3122 | ;; |
3123 | |
3124 | aix[[4-9]]*) |
3125 | - version_type=linux |
3126 | + version_type=linux # correct to gnu/linux during the next big refactor |
3127 | need_lib_prefix=no |
3128 | need_version=no |
3129 | hardcode_into_libs=yes |
3130 | @@ -2190,7 +2323,7 @@ |
3131 | m68k) |
3132 | library_names_spec='$libname.ixlibrary $libname.a' |
3133 | # Create ${libname}_ixlibrary.a entries in /sys/libs. |
3134 | - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' |
3135 | + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' |
3136 | ;; |
3137 | esac |
3138 | ;; |
3139 | @@ -2202,7 +2335,7 @@ |
3140 | ;; |
3141 | |
3142 | bsdi[[45]]*) |
3143 | - version_type=linux |
3144 | + version_type=linux # correct to gnu/linux during the next big refactor |
3145 | need_version=no |
3146 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3147 | soname_spec='${libname}${release}${shared_ext}$major' |
3148 | @@ -2221,8 +2354,9 @@ |
3149 | need_version=no |
3150 | need_lib_prefix=no |
3151 | |
3152 | - case $GCC,$host_os in |
3153 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
3154 | + case $GCC,$cc_basename in |
3155 | + yes,*) |
3156 | + # gcc |
3157 | library_names_spec='$libname.dll.a' |
3158 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
3159 | postinstall_cmds='base_file=`basename \${file}`~ |
3160 | @@ -2243,36 +2377,83 @@ |
3161 | cygwin*) |
3162 | # Cygwin DLLs use 'cyg' prefix rather than 'lib' |
3163 | soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
3164 | - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" |
3165 | +m4_if([$1], [],[ |
3166 | + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) |
3167 | ;; |
3168 | mingw* | cegcc*) |
3169 | # MinGW DLLs use traditional 'lib' prefix |
3170 | soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
3171 | - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
3172 | - if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then |
3173 | - # It is most probably a Windows format PATH printed by |
3174 | - # mingw gcc, but we are running on Cygwin. Gcc prints its search |
3175 | - # path with ; separators, and with drive letters. We can handle the |
3176 | - # drive letters (cygwin fileutils understands them), so leave them, |
3177 | - # especially as we might pass files found there to a mingw objdump, |
3178 | - # which wouldn't understand a cygwinified path. Ahh. |
3179 | - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
3180 | - else |
3181 | - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
3182 | - fi |
3183 | ;; |
3184 | pw32*) |
3185 | # pw32 DLLs use 'pw' prefix rather than 'lib' |
3186 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
3187 | ;; |
3188 | esac |
3189 | + dynamic_linker='Win32 ld.exe' |
3190 | + ;; |
3191 | + |
3192 | + *,cl*) |
3193 | + # Native MSVC |
3194 | + libname_spec='$name' |
3195 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
3196 | + library_names_spec='${libname}.dll.lib' |
3197 | + |
3198 | + case $build_os in |
3199 | + mingw*) |
3200 | + sys_lib_search_path_spec= |
3201 | + lt_save_ifs=$IFS |
3202 | + IFS=';' |
3203 | + for lt_path in $LIB |
3204 | + do |
3205 | + IFS=$lt_save_ifs |
3206 | + # Let DOS variable expansion print the short 8.3 style file name. |
3207 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
3208 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
3209 | + done |
3210 | + IFS=$lt_save_ifs |
3211 | + # Convert to MSYS style. |
3212 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` |
3213 | + ;; |
3214 | + cygwin*) |
3215 | + # Convert to unix form, then to dos form, then back to unix form |
3216 | + # but this time dos style (no spaces!) so that the unix form looks |
3217 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
3218 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
3219 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
3220 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
3221 | + ;; |
3222 | + *) |
3223 | + sys_lib_search_path_spec="$LIB" |
3224 | + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then |
3225 | + # It is most probably a Windows format PATH. |
3226 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
3227 | + else |
3228 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
3229 | + fi |
3230 | + # FIXME: find the short name or the path components, as spaces are |
3231 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
3232 | + ;; |
3233 | + esac |
3234 | + |
3235 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
3236 | + postinstall_cmds='base_file=`basename \${file}`~ |
3237 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
3238 | + dldir=$destdir/`dirname \$dlpath`~ |
3239 | + test -d \$dldir || mkdir -p \$dldir~ |
3240 | + $install_prog $dir/$dlname \$dldir/$dlname' |
3241 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
3242 | + dlpath=$dir/\$dldll~ |
3243 | + $RM \$dlpath' |
3244 | + shlibpath_overrides_runpath=yes |
3245 | + dynamic_linker='Win32 link.exe' |
3246 | ;; |
3247 | |
3248 | *) |
3249 | + # Assume MSVC wrapper |
3250 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' |
3251 | + dynamic_linker='Win32 ld.exe' |
3252 | ;; |
3253 | esac |
3254 | - dynamic_linker='Win32 ld.exe' |
3255 | # FIXME: first we should search . and the directory the executable is in |
3256 | shlibpath_var=PATH |
3257 | ;; |
3258 | @@ -2293,7 +2474,7 @@ |
3259 | ;; |
3260 | |
3261 | dgux*) |
3262 | - version_type=linux |
3263 | + version_type=linux # correct to gnu/linux during the next big refactor |
3264 | need_lib_prefix=no |
3265 | need_version=no |
3266 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' |
3267 | @@ -2301,10 +2482,6 @@ |
3268 | shlibpath_var=LD_LIBRARY_PATH |
3269 | ;; |
3270 | |
3271 | -freebsd1*) |
3272 | - dynamic_linker=no |
3273 | - ;; |
3274 | - |
3275 | freebsd* | dragonfly*) |
3276 | # DragonFly does not have aout. When/if they implement a new |
3277 | # versioning mechanism, adjust this. |
3278 | @@ -2312,7 +2489,7 @@ |
3279 | objformat=`/usr/bin/objformat` |
3280 | else |
3281 | case $host_os in |
3282 | - freebsd[[123]]*) objformat=aout ;; |
3283 | + freebsd[[23]].*) objformat=aout ;; |
3284 | *) objformat=elf ;; |
3285 | esac |
3286 | fi |
3287 | @@ -2330,7 +2507,7 @@ |
3288 | esac |
3289 | shlibpath_var=LD_LIBRARY_PATH |
3290 | case $host_os in |
3291 | - freebsd2*) |
3292 | + freebsd2.*) |
3293 | shlibpath_overrides_runpath=yes |
3294 | ;; |
3295 | freebsd3.[[01]]* | freebsdelf3.[[01]]*) |
3296 | @@ -2350,12 +2527,26 @@ |
3297 | ;; |
3298 | |
3299 | gnu*) |
3300 | - version_type=linux |
3301 | + version_type=linux # correct to gnu/linux during the next big refactor |
3302 | need_lib_prefix=no |
3303 | need_version=no |
3304 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
3305 | soname_spec='${libname}${release}${shared_ext}$major' |
3306 | shlibpath_var=LD_LIBRARY_PATH |
3307 | + shlibpath_overrides_runpath=no |
3308 | + hardcode_into_libs=yes |
3309 | + ;; |
3310 | + |
3311 | +haiku*) |
3312 | + version_type=linux # correct to gnu/linux during the next big refactor |
3313 | + need_lib_prefix=no |
3314 | + need_version=no |
3315 | + dynamic_linker="$host_os runtime_loader" |
3316 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
3317 | + soname_spec='${libname}${release}${shared_ext}$major' |
3318 | + shlibpath_var=LIBRARY_PATH |
3319 | + shlibpath_overrides_runpath=yes |
3320 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
3321 | hardcode_into_libs=yes |
3322 | ;; |
3323 | |
3324 | @@ -2401,12 +2592,14 @@ |
3325 | soname_spec='${libname}${release}${shared_ext}$major' |
3326 | ;; |
3327 | esac |
3328 | - # HP-UX runs *really* slowly unless shared libraries are mode 555. |
3329 | + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... |
3330 | postinstall_cmds='chmod 555 $lib' |
3331 | + # or fails outright, so override atomically: |
3332 | + install_override_mode=555 |
3333 | ;; |
3334 | |
3335 | interix[[3-9]]*) |
3336 | - version_type=linux |
3337 | + version_type=linux # correct to gnu/linux during the next big refactor |
3338 | need_lib_prefix=no |
3339 | need_version=no |
3340 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
3341 | @@ -2422,7 +2615,7 @@ |
3342 | nonstopux*) version_type=nonstopux ;; |
3343 | *) |
3344 | if test "$lt_cv_prog_gnu_ld" = yes; then |
3345 | - version_type=linux |
3346 | + version_type=linux # correct to gnu/linux during the next big refactor |
3347 | else |
3348 | version_type=irix |
3349 | fi ;; |
3350 | @@ -2459,9 +2652,9 @@ |
3351 | dynamic_linker=no |
3352 | ;; |
3353 | |
3354 | -# This must be Linux ELF. |
3355 | +# This must be glibc/ELF. |
3356 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
3357 | - version_type=linux |
3358 | + version_type=linux # correct to gnu/linux during the next big refactor |
3359 | need_lib_prefix=no |
3360 | need_version=no |
3361 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3362 | @@ -2469,16 +2662,21 @@ |
3363 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
3364 | shlibpath_var=LD_LIBRARY_PATH |
3365 | shlibpath_overrides_runpath=no |
3366 | + |
3367 | # Some binutils ld are patched to set DT_RUNPATH |
3368 | - save_LDFLAGS=$LDFLAGS |
3369 | - save_libdir=$libdir |
3370 | - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ |
3371 | - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" |
3372 | - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], |
3373 | - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], |
3374 | - [shlibpath_overrides_runpath=yes])]) |
3375 | - LDFLAGS=$save_LDFLAGS |
3376 | - libdir=$save_libdir |
3377 | + AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], |
3378 | + [lt_cv_shlibpath_overrides_runpath=no |
3379 | + save_LDFLAGS=$LDFLAGS |
3380 | + save_libdir=$libdir |
3381 | + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ |
3382 | + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" |
3383 | + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], |
3384 | + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], |
3385 | + [lt_cv_shlibpath_overrides_runpath=yes])]) |
3386 | + LDFLAGS=$save_LDFLAGS |
3387 | + libdir=$save_libdir |
3388 | + ]) |
3389 | + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath |
3390 | |
3391 | # This implies no fast_install, which is unacceptable. |
3392 | # Some rework will be needed to allow for fast_install |
3393 | @@ -2487,7 +2685,7 @@ |
3394 | |
3395 | # Append ld.so.conf contents to the search path |
3396 | if test -f /etc/ld.so.conf; then |
3397 | - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` |
3398 | + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` |
3399 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
3400 | fi |
3401 | |
3402 | @@ -2531,7 +2729,7 @@ |
3403 | ;; |
3404 | |
3405 | newsos6) |
3406 | - version_type=linux |
3407 | + version_type=linux # correct to gnu/linux during the next big refactor |
3408 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3409 | shlibpath_var=LD_LIBRARY_PATH |
3410 | shlibpath_overrides_runpath=yes |
3411 | @@ -2600,7 +2798,7 @@ |
3412 | ;; |
3413 | |
3414 | solaris*) |
3415 | - version_type=linux |
3416 | + version_type=linux # correct to gnu/linux during the next big refactor |
3417 | need_lib_prefix=no |
3418 | need_version=no |
3419 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3420 | @@ -2625,7 +2823,7 @@ |
3421 | ;; |
3422 | |
3423 | sysv4 | sysv4.3*) |
3424 | - version_type=linux |
3425 | + version_type=linux # correct to gnu/linux during the next big refactor |
3426 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3427 | soname_spec='${libname}${release}${shared_ext}$major' |
3428 | shlibpath_var=LD_LIBRARY_PATH |
3429 | @@ -2649,7 +2847,7 @@ |
3430 | |
3431 | sysv4*MP*) |
3432 | if test -d /usr/nec ;then |
3433 | - version_type=linux |
3434 | + version_type=linux # correct to gnu/linux during the next big refactor |
3435 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' |
3436 | soname_spec='$libname${shared_ext}.$major' |
3437 | shlibpath_var=LD_LIBRARY_PATH |
3438 | @@ -2680,7 +2878,7 @@ |
3439 | |
3440 | tpf*) |
3441 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. |
3442 | - version_type=linux |
3443 | + version_type=linux # correct to gnu/linux during the next big refactor |
3444 | need_lib_prefix=no |
3445 | need_version=no |
3446 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3447 | @@ -2690,7 +2888,7 @@ |
3448 | ;; |
3449 | |
3450 | uts4*) |
3451 | - version_type=linux |
3452 | + version_type=linux # correct to gnu/linux during the next big refactor |
3453 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3454 | soname_spec='${libname}${release}${shared_ext}$major' |
3455 | shlibpath_var=LD_LIBRARY_PATH |
3456 | @@ -2732,6 +2930,8 @@ |
3457 | The last name is the one that the linker finds with -lNAME]]) |
3458 | _LT_DECL([], [soname_spec], [1], |
3459 | [[The coded name of the library, if different from the real name]]) |
3460 | +_LT_DECL([], [install_override_mode], [1], |
3461 | + [Permission mode override for installation of shared libraries]) |
3462 | _LT_DECL([], [postinstall_cmds], [2], |
3463 | [Command to use after installation of a shared archive]) |
3464 | _LT_DECL([], [postuninstall_cmds], [2], |
3465 | @@ -2844,6 +3044,7 @@ |
3466 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
3467 | m4_require([_LT_DECL_SED])dnl |
3468 | m4_require([_LT_DECL_EGREP])dnl |
3469 | +m4_require([_LT_PROG_ECHO_BACKSLASH])dnl |
3470 | |
3471 | AC_ARG_WITH([gnu-ld], |
3472 | [AS_HELP_STRING([--with-gnu-ld], |
3473 | @@ -2965,6 +3166,11 @@ |
3474 | esac |
3475 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
3476 | case $host_os in |
3477 | + cygwin* | mingw* | pw32* | cegcc*) |
3478 | + if test "$GCC" != yes; then |
3479 | + reload_cmds=false |
3480 | + fi |
3481 | + ;; |
3482 | darwin*) |
3483 | if test "$GCC" = yes; then |
3484 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
3485 | @@ -2973,8 +3179,8 @@ |
3486 | fi |
3487 | ;; |
3488 | esac |
3489 | -_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl |
3490 | -_LT_DECL([], [reload_cmds], [2])dnl |
3491 | +_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl |
3492 | +_LT_TAGDECL([], [reload_cmds], [2])dnl |
3493 | ])# _LT_CMD_RELOAD |
3494 | |
3495 | |
3496 | @@ -3026,16 +3232,18 @@ |
3497 | # Base MSYS/MinGW do not provide the 'file' command needed by |
3498 | # func_win32_libid shell function, so use a weaker test based on 'objdump', |
3499 | # unless we find 'file', for example because we are cross-compiling. |
3500 | - if ( file / ) >/dev/null 2>&1; then |
3501 | + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. |
3502 | + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then |
3503 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
3504 | lt_cv_file_magic_cmd='func_win32_libid' |
3505 | else |
3506 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
3507 | + # Keep this pattern in sync with the one in func_win32_libid. |
3508 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
3509 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
3510 | fi |
3511 | ;; |
3512 | |
3513 | -cegcc) |
3514 | +cegcc*) |
3515 | # use the weaker test based on 'objdump'. See mingw*. |
3516 | lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' |
3517 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
3518 | @@ -3065,6 +3273,10 @@ |
3519 | lt_cv_deplibs_check_method=pass_all |
3520 | ;; |
3521 | |
3522 | +haiku*) |
3523 | + lt_cv_deplibs_check_method=pass_all |
3524 | + ;; |
3525 | + |
3526 | hpux10.20* | hpux11*) |
3527 | lt_cv_file_magic_cmd=/usr/bin/file |
3528 | case $host_cpu in |
3529 | @@ -3073,11 +3285,11 @@ |
3530 | lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so |
3531 | ;; |
3532 | hppa*64*) |
3533 | - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] |
3534 | + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] |
3535 | lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl |
3536 | ;; |
3537 | *) |
3538 | - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' |
3539 | + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' |
3540 | lt_cv_file_magic_test_file=/usr/lib/libc.sl |
3541 | ;; |
3542 | esac |
3543 | @@ -3098,7 +3310,7 @@ |
3544 | lt_cv_deplibs_check_method=pass_all |
3545 | ;; |
3546 | |
3547 | -# This must be Linux ELF. |
3548 | +# This must be glibc/ELF. |
3549 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
3550 | lt_cv_deplibs_check_method=pass_all |
3551 | ;; |
3552 | @@ -3177,6 +3389,21 @@ |
3553 | ;; |
3554 | esac |
3555 | ]) |
3556 | + |
3557 | +file_magic_glob= |
3558 | +want_nocaseglob=no |
3559 | +if test "$build" = "$host"; then |
3560 | + case $host_os in |
3561 | + mingw* | pw32*) |
3562 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
3563 | + want_nocaseglob=yes |
3564 | + else |
3565 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` |
3566 | + fi |
3567 | + ;; |
3568 | + esac |
3569 | +fi |
3570 | + |
3571 | file_magic_cmd=$lt_cv_file_magic_cmd |
3572 | deplibs_check_method=$lt_cv_deplibs_check_method |
3573 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
3574 | @@ -3184,7 +3411,11 @@ |
3575 | _LT_DECL([], [deplibs_check_method], [1], |
3576 | [Method to check whether dependent libraries are shared objects]) |
3577 | _LT_DECL([], [file_magic_cmd], [1], |
3578 | - [Command to use when deplibs_check_method == "file_magic"]) |
3579 | + [Command to use when deplibs_check_method = "file_magic"]) |
3580 | +_LT_DECL([], [file_magic_glob], [1], |
3581 | + [How to find potential files when deplibs_check_method = "file_magic"]) |
3582 | +_LT_DECL([], [want_nocaseglob], [1], |
3583 | + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) |
3584 | ])# _LT_CHECK_MAGIC_METHOD |
3585 | |
3586 | |
3587 | @@ -3241,7 +3472,19 @@ |
3588 | NM="$lt_cv_path_NM" |
3589 | else |
3590 | # Didn't find any BSD compatible name lister, look for dumpbin. |
3591 | - AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) |
3592 | + if test -n "$DUMPBIN"; then : |
3593 | + # Let the user override the test. |
3594 | + else |
3595 | + AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) |
3596 | + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in |
3597 | + *COFF*) |
3598 | + DUMPBIN="$DUMPBIN -symbols" |
3599 | + ;; |
3600 | + *) |
3601 | + DUMPBIN=: |
3602 | + ;; |
3603 | + esac |
3604 | + fi |
3605 | AC_SUBST([DUMPBIN]) |
3606 | if test "$DUMPBIN" != ":"; then |
3607 | NM="$DUMPBIN" |
3608 | @@ -3254,13 +3497,13 @@ |
3609 | AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], |
3610 | [lt_cv_nm_interface="BSD nm" |
3611 | echo "int some_variable = 0;" > conftest.$ac_ext |
3612 | - (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) |
3613 | + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) |
3614 | (eval "$ac_compile" 2>conftest.err) |
3615 | cat conftest.err >&AS_MESSAGE_LOG_FD |
3616 | - (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) |
3617 | + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) |
3618 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
3619 | cat conftest.err >&AS_MESSAGE_LOG_FD |
3620 | - (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) |
3621 | + (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) |
3622 | cat conftest.out >&AS_MESSAGE_LOG_FD |
3623 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
3624 | lt_cv_nm_interface="MS dumpbin" |
3625 | @@ -3275,6 +3518,67 @@ |
3626 | dnl AC_DEFUN([AM_PROG_NM], []) |
3627 | dnl AC_DEFUN([AC_PROG_NM], []) |
3628 | |
3629 | +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB |
3630 | +# -------------------------------- |
3631 | +# how to determine the name of the shared library |
3632 | +# associated with a specific link library. |
3633 | +# -- PORTME fill in with the dynamic library characteristics |
3634 | +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], |
3635 | +[m4_require([_LT_DECL_EGREP]) |
3636 | +m4_require([_LT_DECL_OBJDUMP]) |
3637 | +m4_require([_LT_DECL_DLLTOOL]) |
3638 | +AC_CACHE_CHECK([how to associate runtime and link libraries], |
3639 | +lt_cv_sharedlib_from_linklib_cmd, |
3640 | +[lt_cv_sharedlib_from_linklib_cmd='unknown' |
3641 | + |
3642 | +case $host_os in |
3643 | +cygwin* | mingw* | pw32* | cegcc*) |
3644 | + # two different shell functions defined in ltmain.sh |
3645 | + # decide which to use based on capabilities of $DLLTOOL |
3646 | + case `$DLLTOOL --help 2>&1` in |
3647 | + *--identify-strict*) |
3648 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
3649 | + ;; |
3650 | + *) |
3651 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
3652 | + ;; |
3653 | + esac |
3654 | + ;; |
3655 | +*) |
3656 | + # fallback: assume linklib IS sharedlib |
3657 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
3658 | + ;; |
3659 | +esac |
3660 | +]) |
3661 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
3662 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
3663 | + |
3664 | +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], |
3665 | + [Command to associate shared and link libraries]) |
3666 | +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB |
3667 | + |
3668 | + |
3669 | +# _LT_PATH_MANIFEST_TOOL |
3670 | +# ---------------------- |
3671 | +# locate the manifest tool |
3672 | +m4_defun([_LT_PATH_MANIFEST_TOOL], |
3673 | +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) |
3674 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
3675 | +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], |
3676 | + [lt_cv_path_mainfest_tool=no |
3677 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD |
3678 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
3679 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
3680 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
3681 | + lt_cv_path_mainfest_tool=yes |
3682 | + fi |
3683 | + rm -f conftest*]) |
3684 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
3685 | + MANIFEST_TOOL=: |
3686 | +fi |
3687 | +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl |
3688 | +])# _LT_PATH_MANIFEST_TOOL |
3689 | + |
3690 | |
3691 | # LT_LIB_M |
3692 | # -------- |
3693 | @@ -3283,7 +3587,7 @@ |
3694 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
3695 | LIBM= |
3696 | case $host in |
3697 | -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) |
3698 | +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) |
3699 | # These system don't have libm, or don't need it |
3700 | ;; |
3701 | *-ncr-sysv4.3*) |
3702 | @@ -3311,7 +3615,12 @@ |
3703 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= |
3704 | |
3705 | if test "$GCC" = yes; then |
3706 | - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' |
3707 | + case $cc_basename in |
3708 | + nvcc*) |
3709 | + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; |
3710 | + *) |
3711 | + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; |
3712 | + esac |
3713 | |
3714 | _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], |
3715 | lt_cv_prog_compiler_rtti_exceptions, |
3716 | @@ -3328,6 +3637,7 @@ |
3717 | m4_defun([_LT_CMD_GLOBAL_SYMBOLS], |
3718 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
3719 | AC_REQUIRE([AC_PROG_CC])dnl |
3720 | +AC_REQUIRE([AC_PROG_AWK])dnl |
3721 | AC_REQUIRE([LT_PATH_NM])dnl |
3722 | AC_REQUIRE([LT_PATH_LD])dnl |
3723 | m4_require([_LT_DECL_SED])dnl |
3724 | @@ -3395,8 +3705,8 @@ |
3725 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
3726 | |
3727 | # Transform an extracted symbol line into symbol name and symbol address |
3728 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" |
3729 | -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
3730 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" |
3731 | +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
3732 | |
3733 | # Handle CRLF in mingw tool chain |
3734 | opt_cr= |
3735 | @@ -3420,6 +3730,7 @@ |
3736 | # which start with @ or ?. |
3737 | lt_cv_sys_global_symbol_pipe="$AWK ['"\ |
3738 | " {last_section=section; section=\$ 3};"\ |
3739 | +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ |
3740 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ |
3741 | " \$ 0!~/External *\|/{next};"\ |
3742 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ |
3743 | @@ -3432,6 +3743,7 @@ |
3744 | else |
3745 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
3746 | fi |
3747 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
3748 | |
3749 | # Check to see that the pipe works correctly. |
3750 | pipe_works=no |
3751 | @@ -3453,7 +3765,7 @@ |
3752 | if AC_TRY_EVAL(ac_compile); then |
3753 | # Now try to grab the symbols. |
3754 | nlist=conftest.nm |
3755 | - if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then |
3756 | + if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then |
3757 | # Try sorting and uniquifying the output. |
3758 | if sort "$nlist" | uniq > "$nlist"T; then |
3759 | mv -f "$nlist"T "$nlist" |
3760 | @@ -3465,6 +3777,18 @@ |
3761 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
3762 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
3763 | cat <<_LT_EOF > conftest.$ac_ext |
3764 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
3765 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
3766 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
3767 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
3768 | +# define LT@&t@_DLSYM_CONST |
3769 | +#elif defined(__osf__) |
3770 | +/* This system does not cope well with relocations in const data. */ |
3771 | +# define LT@&t@_DLSYM_CONST |
3772 | +#else |
3773 | +# define LT@&t@_DLSYM_CONST const |
3774 | +#endif |
3775 | + |
3776 | #ifdef __cplusplus |
3777 | extern "C" { |
3778 | #endif |
3779 | @@ -3476,7 +3800,7 @@ |
3780 | cat <<_LT_EOF >> conftest.$ac_ext |
3781 | |
3782 | /* The mapping between symbol names and symbols. */ |
3783 | -const struct { |
3784 | +LT@&t@_DLSYM_CONST struct { |
3785 | const char *name; |
3786 | void *address; |
3787 | } |
3788 | @@ -3502,15 +3826,15 @@ |
3789 | _LT_EOF |
3790 | # Now try linking the two files. |
3791 | mv conftest.$ac_objext conftstm.$ac_objext |
3792 | - lt_save_LIBS="$LIBS" |
3793 | - lt_save_CFLAGS="$CFLAGS" |
3794 | + lt_globsym_save_LIBS=$LIBS |
3795 | + lt_globsym_save_CFLAGS=$CFLAGS |
3796 | LIBS="conftstm.$ac_objext" |
3797 | CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" |
3798 | if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then |
3799 | pipe_works=yes |
3800 | fi |
3801 | - LIBS="$lt_save_LIBS" |
3802 | - CFLAGS="$lt_save_CFLAGS" |
3803 | + LIBS=$lt_globsym_save_LIBS |
3804 | + CFLAGS=$lt_globsym_save_CFLAGS |
3805 | else |
3806 | echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD |
3807 | fi |
3808 | @@ -3543,6 +3867,13 @@ |
3809 | AC_MSG_RESULT(ok) |
3810 | fi |
3811 | |
3812 | +# Response file support. |
3813 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
3814 | + nm_file_list_spec='@' |
3815 | +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then |
3816 | + nm_file_list_spec='@' |
3817 | +fi |
3818 | + |
3819 | _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], |
3820 | [Take the output of nm and produce a listing of raw symbols and C names]) |
3821 | _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], |
3822 | @@ -3553,6 +3884,8 @@ |
3823 | _LT_DECL([global_symbol_to_c_name_address_lib_prefix], |
3824 | [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], |
3825 | [Transform the output of nm in a C name address pair when lib prefix is needed]) |
3826 | +_LT_DECL([], [nm_file_list_spec], [1], |
3827 | + [Specify filename containing input files for $NM]) |
3828 | ]) # _LT_CMD_GLOBAL_SYMBOLS |
3829 | |
3830 | |
3831 | @@ -3564,7 +3897,6 @@ |
3832 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
3833 | _LT_TAGVAR(lt_prog_compiler_static, $1)= |
3834 | |
3835 | -AC_MSG_CHECKING([for $compiler option to produce PIC]) |
3836 | m4_if([$1], [CXX], [ |
3837 | # C++ specific cases for pic, static, wl, etc. |
3838 | if test "$GXX" = yes; then |
3839 | @@ -3615,6 +3947,11 @@ |
3840 | # DJGPP does not support shared libraries at all |
3841 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
3842 | ;; |
3843 | + haiku*) |
3844 | + # PIC is the default for Haiku. |
3845 | + # The "-static" flag exists, but is broken. |
3846 | + _LT_TAGVAR(lt_prog_compiler_static, $1)= |
3847 | + ;; |
3848 | interix[[3-9]]*) |
3849 | # Interix 3.x gcc -fpic/-fPIC options generate broken code. |
3850 | # Instead, we relocate shared libraries at runtime. |
3851 | @@ -3664,6 +4001,12 @@ |
3852 | ;; |
3853 | esac |
3854 | ;; |
3855 | + mingw* | cygwin* | os2* | pw32* | cegcc*) |
3856 | + # This hack is so that the source file can tell whether it is being |
3857 | + # built for inclusion in a dll (and should export symbols for example). |
3858 | + m4_if([$1], [GCJ], [], |
3859 | + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) |
3860 | + ;; |
3861 | dgux*) |
3862 | case $cc_basename in |
3863 | ec++*) |
3864 | @@ -3753,8 +4096,8 @@ |
3865 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
3866 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
3867 | ;; |
3868 | - xlc* | xlC*) |
3869 | - # IBM XL 8.0 on PPC |
3870 | + xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) |
3871 | + # IBM XL 8.0, 9.0 on PPC and BlueGene |
3872 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3873 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' |
3874 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' |
3875 | @@ -3816,7 +4159,7 @@ |
3876 | ;; |
3877 | solaris*) |
3878 | case $cc_basename in |
3879 | - CC*) |
3880 | + CC* | sunCC*) |
3881 | # Sun C++ 4.2, 5.x and Centerline C++ |
3882 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3883 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3884 | @@ -3920,6 +4263,12 @@ |
3885 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' |
3886 | ;; |
3887 | |
3888 | + haiku*) |
3889 | + # PIC is the default for Haiku. |
3890 | + # The "-static" flag exists, but is broken. |
3891 | + _LT_TAGVAR(lt_prog_compiler_static, $1)= |
3892 | + ;; |
3893 | + |
3894 | hpux*) |
3895 | # PIC is the default for 64-bit PA HP-UX, but not for 32-bit |
3896 | # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag |
3897 | @@ -3962,6 +4311,15 @@ |
3898 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
3899 | ;; |
3900 | esac |
3901 | + |
3902 | + case $cc_basename in |
3903 | + nvcc*) # Cuda Compiler Driver 2.2 |
3904 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' |
3905 | + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then |
3906 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" |
3907 | + fi |
3908 | + ;; |
3909 | + esac |
3910 | else |
3911 | # PORTME Check for flag to pass linker flags through the system compiler. |
3912 | case $host_os in |
3913 | @@ -4025,7 +4383,13 @@ |
3914 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' |
3915 | _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' |
3916 | ;; |
3917 | - pgcc* | pgf77* | pgf90* | pgf95*) |
3918 | + nagfor*) |
3919 | + # NAG Fortran compiler |
3920 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' |
3921 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' |
3922 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3923 | + ;; |
3924 | + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
3925 | # Portland Group compilers (*not* the Pentium gcc compiler, |
3926 | # which looks to be a dead project) |
3927 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3928 | @@ -4037,25 +4401,40 @@ |
3929 | # All Alpha code is PIC. |
3930 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
3931 | ;; |
3932 | - xl*) |
3933 | - # IBM XL C 8.0/Fortran 10.1 on PPC |
3934 | + xl* | bgxl* | bgf* | mpixl*) |
3935 | + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene |
3936 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3937 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' |
3938 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' |
3939 | ;; |
3940 | *) |
3941 | case `$CC -V 2>&1 | sed 5q` in |
3942 | + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) |
3943 | + # Sun Fortran 8.3 passes all unrecognized flags to the linker |
3944 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3945 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3946 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' |
3947 | + ;; |
3948 | + *Sun\ F* | *Sun*Fortran*) |
3949 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3950 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3951 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' |
3952 | + ;; |
3953 | *Sun\ C*) |
3954 | # Sun C 5.9 |
3955 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3956 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3957 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3958 | ;; |
3959 | - *Sun\ F*) |
3960 | - # Sun Fortran 8.3 passes all unrecognized flags to the linker |
3961 | - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3962 | + *Intel*\ [[CF]]*Compiler*) |
3963 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3964 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
3965 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' |
3966 | + ;; |
3967 | + *Portland\ Group*) |
3968 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3969 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' |
3970 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3971 | - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' |
3972 | ;; |
3973 | esac |
3974 | ;; |
3975 | @@ -4087,7 +4466,7 @@ |
3976 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3977 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3978 | case $cc_basename in |
3979 | - f77* | f90* | f95*) |
3980 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
3981 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; |
3982 | *) |
3983 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; |
3984 | @@ -4144,9 +4523,11 @@ |
3985 | _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" |
3986 | ;; |
3987 | esac |
3988 | -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) |
3989 | -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], |
3990 | - [How to pass a linker flag through the compiler]) |
3991 | + |
3992 | +AC_CACHE_CHECK([for $compiler option to produce PIC], |
3993 | + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], |
3994 | + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) |
3995 | +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) |
3996 | |
3997 | # |
3998 | # Check to make sure the PIC flag actually works. |
3999 | @@ -4165,6 +4546,8 @@ |
4000 | _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], |
4001 | [Additional compiler flags for building library objects]) |
4002 | |
4003 | +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], |
4004 | + [How to pass a linker flag through the compiler]) |
4005 | # |
4006 | # Check to make sure the static flag actually works. |
4007 | # |
4008 | @@ -4185,6 +4568,7 @@ |
4009 | m4_defun([_LT_LINKER_SHLIBS], |
4010 | [AC_REQUIRE([LT_PATH_LD])dnl |
4011 | AC_REQUIRE([LT_PATH_NM])dnl |
4012 | +m4_require([_LT_PATH_MANIFEST_TOOL])dnl |
4013 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
4014 | m4_require([_LT_DECL_EGREP])dnl |
4015 | m4_require([_LT_DECL_SED])dnl |
4016 | @@ -4193,30 +4577,40 @@ |
4017 | AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) |
4018 | m4_if([$1], [CXX], [ |
4019 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
4020 | + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] |
4021 | case $host_os in |
4022 | aix[[4-9]]*) |
4023 | # If we're using GNU nm, then we don't want the "-C" option. |
4024 | # -C means demangle to AIX nm, but means don't demangle with GNU nm |
4025 | + # Also, AIX nm treats weak defined symbols like other global defined |
4026 | + # symbols, whereas GNU nm marks them as "W". |
4027 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
4028 | - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
4029 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
4030 | else |
4031 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
4032 | fi |
4033 | ;; |
4034 | pw32*) |
4035 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" |
4036 | - ;; |
4037 | + ;; |
4038 | cygwin* | mingw* | cegcc*) |
4039 | - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' |
4040 | - ;; |
4041 | - linux* | k*bsd*-gnu) |
4042 | + case $cc_basename in |
4043 | + cl*) |
4044 | + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' |
4045 | + ;; |
4046 | + *) |
4047 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' |
4048 | + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] |
4049 | + ;; |
4050 | + esac |
4051 | + ;; |
4052 | + linux* | k*bsd*-gnu | gnu*) |
4053 | _LT_TAGVAR(link_all_deplibs, $1)=no |
4054 | - ;; |
4055 | + ;; |
4056 | *) |
4057 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
4058 | - ;; |
4059 | + ;; |
4060 | esac |
4061 | - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] |
4062 | ], [ |
4063 | runpath_var= |
4064 | _LT_TAGVAR(allow_undefined_flag, $1)= |
4065 | @@ -4231,7 +4625,6 @@ |
4066 | _LT_TAGVAR(hardcode_direct, $1)=no |
4067 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
4068 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
4069 | - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
4070 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
4071 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
4072 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
4073 | @@ -4276,13 +4669,39 @@ |
4074 | openbsd*) |
4075 | with_gnu_ld=no |
4076 | ;; |
4077 | - linux* | k*bsd*-gnu) |
4078 | + linux* | k*bsd*-gnu | gnu*) |
4079 | _LT_TAGVAR(link_all_deplibs, $1)=no |
4080 | ;; |
4081 | esac |
4082 | |
4083 | _LT_TAGVAR(ld_shlibs, $1)=yes |
4084 | + |
4085 | + # On some targets, GNU ld is compatible enough with the native linker |
4086 | + # that we're better off using the native interface for both. |
4087 | + lt_use_gnu_ld_interface=no |
4088 | if test "$with_gnu_ld" = yes; then |
4089 | + case $host_os in |
4090 | + aix*) |
4091 | + # The AIX port of GNU ld has always aspired to compatibility |
4092 | + # with the native linker. However, as the warning in the GNU ld |
4093 | + # block says, versions before 2.19.5* couldn't really create working |
4094 | + # shared libraries, regardless of the interface used. |
4095 | + case `$LD -v 2>&1` in |
4096 | + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; |
4097 | + *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; |
4098 | + *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; |
4099 | + *) |
4100 | + lt_use_gnu_ld_interface=yes |
4101 | + ;; |
4102 | + esac |
4103 | + ;; |
4104 | + *) |
4105 | + lt_use_gnu_ld_interface=yes |
4106 | + ;; |
4107 | + esac |
4108 | + fi |
4109 | + |
4110 | + if test "$lt_use_gnu_ld_interface" = yes; then |
4111 | # If archive_cmds runs LD, not CC, wlarc should be empty |
4112 | wlarc='${wl}' |
4113 | |
4114 | @@ -4316,11 +4735,12 @@ |
4115 | _LT_TAGVAR(ld_shlibs, $1)=no |
4116 | cat <<_LT_EOF 1>&2 |
4117 | |
4118 | -*** Warning: the GNU linker, at least up to release 2.9.1, is reported |
4119 | +*** Warning: the GNU linker, at least up to release 2.19, is reported |
4120 | *** to be unable to reliably create shared libraries on AIX. |
4121 | *** Therefore, libtool is disabling shared libraries support. If you |
4122 | -*** really care for shared libraries, you may want to modify your PATH |
4123 | -*** so that a non-GNU linker is found, and then restart. |
4124 | +*** really care for shared libraries, you may want to install binutils |
4125 | +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. |
4126 | +*** You will then need to restart the configuration process. |
4127 | |
4128 | _LT_EOF |
4129 | fi |
4130 | @@ -4356,10 +4776,12 @@ |
4131 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
4132 | # as there is no search path for DLLs. |
4133 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
4134 | + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' |
4135 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
4136 | _LT_TAGVAR(always_export_symbols, $1)=no |
4137 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
4138 | - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' |
4139 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' |
4140 | + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] |
4141 | |
4142 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
4143 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
4144 | @@ -4377,6 +4799,11 @@ |
4145 | fi |
4146 | ;; |
4147 | |
4148 | + haiku*) |
4149 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4150 | + _LT_TAGVAR(link_all_deplibs, $1)=yes |
4151 | + ;; |
4152 | + |
4153 | interix[[3-9]]*) |
4154 | _LT_TAGVAR(hardcode_direct, $1)=no |
4155 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
4156 | @@ -4402,15 +4829,16 @@ |
4157 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ |
4158 | && test "$tmp_diet" = no |
4159 | then |
4160 | - tmp_addflag= |
4161 | + tmp_addflag=' $pic_flag' |
4162 | tmp_sharedflag='-shared' |
4163 | case $cc_basename,$host_cpu in |
4164 | pgcc*) # Portland Group C compiler |
4165 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
4166 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
4167 | tmp_addflag=' $pic_flag' |
4168 | ;; |
4169 | - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers |
4170 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
4171 | + pgf77* | pgf90* | pgf95* | pgfortran*) |
4172 | + # Portland Group f77 and f90 compilers |
4173 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
4174 | tmp_addflag=' $pic_flag -Mnomain' ;; |
4175 | ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 |
4176 | tmp_addflag=' -i_dynamic' ;; |
4177 | @@ -4421,13 +4849,17 @@ |
4178 | lf95*) # Lahey Fortran 8.1 |
4179 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
4180 | tmp_sharedflag='--shared' ;; |
4181 | - xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
4182 | + xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
4183 | tmp_sharedflag='-qmkshrobj' |
4184 | tmp_addflag= ;; |
4185 | + nvcc*) # Cuda Compiler Driver 2.2 |
4186 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
4187 | + _LT_TAGVAR(compiler_needs_object, $1)=yes |
4188 | + ;; |
4189 | esac |
4190 | case `$CC -V 2>&1 | sed 5q` in |
4191 | *Sun\ C*) # Sun C 5.9 |
4192 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
4193 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
4194 | _LT_TAGVAR(compiler_needs_object, $1)=yes |
4195 | tmp_sharedflag='-G' ;; |
4196 | *Sun\ F*) # Sun Fortran 8.3 |
4197 | @@ -4443,17 +4875,16 @@ |
4198 | fi |
4199 | |
4200 | case $cc_basename in |
4201 | - xlf*) |
4202 | + xlf* | bgf* | bgxlf* | mpixlf*) |
4203 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
4204 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' |
4205 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
4206 | - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' |
4207 | - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
4208 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
4209 | + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
4210 | if test "x$supports_anon_versioning" = xyes; then |
4211 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ |
4212 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
4213 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
4214 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
4215 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
4216 | fi |
4217 | ;; |
4218 | esac |
4219 | @@ -4467,8 +4898,8 @@ |
4220 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
4221 | wlarc= |
4222 | else |
4223 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4224 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4225 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4226 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4227 | fi |
4228 | ;; |
4229 | |
4230 | @@ -4486,8 +4917,8 @@ |
4231 | |
4232 | _LT_EOF |
4233 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
4234 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4235 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4236 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4237 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4238 | else |
4239 | _LT_TAGVAR(ld_shlibs, $1)=no |
4240 | fi |
4241 | @@ -4533,8 +4964,8 @@ |
4242 | |
4243 | *) |
4244 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
4245 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4246 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4247 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4248 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4249 | else |
4250 | _LT_TAGVAR(ld_shlibs, $1)=no |
4251 | fi |
4252 | @@ -4574,8 +5005,10 @@ |
4253 | else |
4254 | # If we're using GNU nm, then we don't want the "-C" option. |
4255 | # -C means demangle to AIX nm, but means don't demangle with GNU nm |
4256 | + # Also, AIX nm treats weak defined symbols like other global |
4257 | + # defined symbols, whereas GNU nm marks them as "W". |
4258 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
4259 | - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
4260 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
4261 | else |
4262 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
4263 | fi |
4264 | @@ -4663,9 +5096,9 @@ |
4265 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
4266 | # Determine the default libpath from the value encoded in an |
4267 | # empty executable. |
4268 | - _LT_SYS_MODULE_PATH_AIX |
4269 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
4270 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
4271 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
4272 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
4273 | else |
4274 | if test "$host_cpu" = ia64; then |
4275 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' |
4276 | @@ -4674,14 +5107,19 @@ |
4277 | else |
4278 | # Determine the default libpath from the value encoded in an |
4279 | # empty executable. |
4280 | - _LT_SYS_MODULE_PATH_AIX |
4281 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
4282 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
4283 | # Warning - without using the other run time loading flags, |
4284 | # -berok will link without error, but may produce a broken library. |
4285 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' |
4286 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' |
4287 | - # Exported symbols can be pulled into shared objects from archives |
4288 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
4289 | + if test "$with_gnu_ld" = yes; then |
4290 | + # We only use this code for GNU lds that support --whole-archive. |
4291 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' |
4292 | + else |
4293 | + # Exported symbols can be pulled into shared objects from archives |
4294 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
4295 | + fi |
4296 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
4297 | # This is similar to how AIX traditionally builds its shared libraries. |
4298 | _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' |
4299 | @@ -4713,20 +5151,64 @@ |
4300 | # Microsoft Visual C++. |
4301 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
4302 | # no search path for DLLs. |
4303 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
4304 | - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
4305 | - # Tell ltmain to make .lib files, not .a files. |
4306 | - libext=lib |
4307 | - # Tell ltmain to make .dll files, not .so files. |
4308 | - shrext_cmds=".dll" |
4309 | - # FIXME: Setting linknames here is a bad hack. |
4310 | - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' |
4311 | - # The linker will automatically build a .lib file if we build a DLL. |
4312 | - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
4313 | - # FIXME: Should let the user specify the lib program. |
4314 | - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' |
4315 | - _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' |
4316 | - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
4317 | + case $cc_basename in |
4318 | + cl*) |
4319 | + # Native MSVC |
4320 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
4321 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
4322 | + _LT_TAGVAR(always_export_symbols, $1)=yes |
4323 | + _LT_TAGVAR(file_list_spec, $1)='@' |
4324 | + # Tell ltmain to make .lib files, not .a files. |
4325 | + libext=lib |
4326 | + # Tell ltmain to make .dll files, not .so files. |
4327 | + shrext_cmds=".dll" |
4328 | + # FIXME: Setting linknames here is a bad hack. |
4329 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
4330 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
4331 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
4332 | + else |
4333 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
4334 | + fi~ |
4335 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
4336 | + linknames=' |
4337 | + # The linker will not automatically build a static lib if we build a DLL. |
4338 | + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
4339 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
4340 | + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' |
4341 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' |
4342 | + # Don't use ranlib |
4343 | + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' |
4344 | + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ |
4345 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
4346 | + case $lt_outputfile in |
4347 | + *.exe|*.EXE) ;; |
4348 | + *) |
4349 | + lt_outputfile="$lt_outputfile.exe" |
4350 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
4351 | + ;; |
4352 | + esac~ |
4353 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
4354 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
4355 | + $RM "$lt_outputfile.manifest"; |
4356 | + fi' |
4357 | + ;; |
4358 | + *) |
4359 | + # Assume MSVC wrapper |
4360 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
4361 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
4362 | + # Tell ltmain to make .lib files, not .a files. |
4363 | + libext=lib |
4364 | + # Tell ltmain to make .dll files, not .so files. |
4365 | + shrext_cmds=".dll" |
4366 | + # FIXME: Setting linknames here is a bad hack. |
4367 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
4368 | + # The linker will automatically build a .lib file if we build a DLL. |
4369 | + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
4370 | + # FIXME: Should let the user specify the lib program. |
4371 | + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' |
4372 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
4373 | + ;; |
4374 | + esac |
4375 | ;; |
4376 | |
4377 | darwin* | rhapsody*) |
4378 | @@ -4739,10 +5221,6 @@ |
4379 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
4380 | ;; |
4381 | |
4382 | - freebsd1*) |
4383 | - _LT_TAGVAR(ld_shlibs, $1)=no |
4384 | - ;; |
4385 | - |
4386 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor |
4387 | # support. Future versions do this automatically, but an explicit c++rt0.o |
4388 | # does not break anything, and helps significantly (at the cost of a little |
4389 | @@ -4755,7 +5233,7 @@ |
4390 | ;; |
4391 | |
4392 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
4393 | - freebsd2*) |
4394 | + freebsd2.*) |
4395 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
4396 | _LT_TAGVAR(hardcode_direct, $1)=yes |
4397 | _LT_TAGVAR(hardcode_minus_L, $1)=yes |
4398 | @@ -4764,7 +5242,7 @@ |
4399 | |
4400 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
4401 | freebsd* | dragonfly*) |
4402 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
4403 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
4404 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
4405 | _LT_TAGVAR(hardcode_direct, $1)=yes |
4406 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
4407 | @@ -4772,7 +5250,7 @@ |
4408 | |
4409 | hpux9*) |
4410 | if test "$GCC" = yes; then |
4411 | - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
4412 | + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
4413 | else |
4414 | _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
4415 | fi |
4416 | @@ -4787,14 +5265,13 @@ |
4417 | ;; |
4418 | |
4419 | hpux10*) |
4420 | - if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
4421 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
4422 | + if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
4423 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
4424 | else |
4425 | _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
4426 | fi |
4427 | if test "$with_gnu_ld" = no; then |
4428 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
4429 | - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' |
4430 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: |
4431 | _LT_TAGVAR(hardcode_direct, $1)=yes |
4432 | _LT_TAGVAR(hardcode_direct_absolute, $1)=yes |
4433 | @@ -4806,16 +5283,16 @@ |
4434 | ;; |
4435 | |
4436 | hpux11*) |
4437 | - if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
4438 | + if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
4439 | case $host_cpu in |
4440 | hppa*64*) |
4441 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
4442 | ;; |
4443 | ia64*) |
4444 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
4445 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
4446 | ;; |
4447 | *) |
4448 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
4449 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
4450 | ;; |
4451 | esac |
4452 | else |
4453 | @@ -4827,7 +5304,14 @@ |
4454 | _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
4455 | ;; |
4456 | *) |
4457 | - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
4458 | + m4_if($1, [], [ |
4459 | + # Older versions of the 11.00 compiler do not understand -b yet |
4460 | + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) |
4461 | + _LT_LINKER_OPTION([if $CC understands -b], |
4462 | + _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], |
4463 | + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], |
4464 | + [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], |
4465 | + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) |
4466 | ;; |
4467 | esac |
4468 | fi |
4469 | @@ -4855,19 +5339,34 @@ |
4470 | |
4471 | irix5* | irix6* | nonstopux*) |
4472 | if test "$GCC" = yes; then |
4473 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4474 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4475 | # Try to use the -exported_symbol ld option, if it does not |
4476 | # work, assume that -exports_file does not work either and |
4477 | # implicitly export all symbols. |
4478 | - save_LDFLAGS="$LDFLAGS" |
4479 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
4480 | - AC_LINK_IFELSE(int foo(void) {}, |
4481 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
4482 | - ) |
4483 | - LDFLAGS="$save_LDFLAGS" |
4484 | + # This should be the same for all languages, so no per-tag cache variable. |
4485 | + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], |
4486 | + [lt_cv_irix_exported_symbol], |
4487 | + [save_LDFLAGS="$LDFLAGS" |
4488 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
4489 | + AC_LINK_IFELSE( |
4490 | + [AC_LANG_SOURCE( |
4491 | + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], |
4492 | + [C++], [[int foo (void) { return 0; }]], |
4493 | + [Fortran 77], [[ |
4494 | + subroutine foo |
4495 | + end]], |
4496 | + [Fortran], [[ |
4497 | + subroutine foo |
4498 | + end]])])], |
4499 | + [lt_cv_irix_exported_symbol=yes], |
4500 | + [lt_cv_irix_exported_symbol=no]) |
4501 | + LDFLAGS="$save_LDFLAGS"]) |
4502 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
4503 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
4504 | + fi |
4505 | else |
4506 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
4507 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
4508 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
4509 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
4510 | fi |
4511 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' |
4512 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
4513 | @@ -4929,17 +5428,17 @@ |
4514 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
4515 | _LT_TAGVAR(hardcode_minus_L, $1)=yes |
4516 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
4517 | - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' |
4518 | + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' |
4519 | _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' |
4520 | ;; |
4521 | |
4522 | osf3*) |
4523 | if test "$GCC" = yes; then |
4524 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
4525 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4526 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4527 | else |
4528 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
4529 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
4530 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
4531 | fi |
4532 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' |
4533 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
4534 | @@ -4949,13 +5448,13 @@ |
4535 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
4536 | if test "$GCC" = yes; then |
4537 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
4538 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4539 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4540 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
4541 | else |
4542 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
4543 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
4544 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
4545 | _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ |
4546 | - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' |
4547 | + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' |
4548 | |
4549 | # Both c and cxx compiler support -rpath directly |
4550 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' |
4551 | @@ -4968,9 +5467,9 @@ |
4552 | _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' |
4553 | if test "$GCC" = yes; then |
4554 | wlarc='${wl}' |
4555 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
4556 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
4557 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
4558 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
4559 | + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
4560 | else |
4561 | case `$CC -V 2>&1` in |
4562 | *"Compilers 5.0"*) |
4563 | @@ -5146,36 +5645,38 @@ |
4564 | # Test whether the compiler implicitly links with -lc since on some |
4565 | # systems, -lgcc has to come before -lc. If gcc already passes -lc |
4566 | # to ld, don't add -lc before -lgcc. |
4567 | - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) |
4568 | - $RM conftest* |
4569 | - echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
4570 | + AC_CACHE_CHECK([whether -lc should be explicitly linked in], |
4571 | + [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), |
4572 | + [$RM conftest* |
4573 | + echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
4574 | |
4575 | - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then |
4576 | - soname=conftest |
4577 | - lib=conftest |
4578 | - libobjs=conftest.$ac_objext |
4579 | - deplibs= |
4580 | - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) |
4581 | - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) |
4582 | - compiler_flags=-v |
4583 | - linker_flags=-v |
4584 | - verstring= |
4585 | - output_objdir=. |
4586 | - libname=conftest |
4587 | - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) |
4588 | - _LT_TAGVAR(allow_undefined_flag, $1)= |
4589 | - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) |
4590 | - then |
4591 | - _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
4592 | - else |
4593 | - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
4594 | - fi |
4595 | - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag |
4596 | - else |
4597 | - cat conftest.err 1>&5 |
4598 | - fi |
4599 | - $RM conftest* |
4600 | - AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) |
4601 | + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then |
4602 | + soname=conftest |
4603 | + lib=conftest |
4604 | + libobjs=conftest.$ac_objext |
4605 | + deplibs= |
4606 | + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) |
4607 | + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) |
4608 | + compiler_flags=-v |
4609 | + linker_flags=-v |
4610 | + verstring= |
4611 | + output_objdir=. |
4612 | + libname=conftest |
4613 | + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) |
4614 | + _LT_TAGVAR(allow_undefined_flag, $1)= |
4615 | + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) |
4616 | + then |
4617 | + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no |
4618 | + else |
4619 | + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
4620 | + fi |
4621 | + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag |
4622 | + else |
4623 | + cat conftest.err 1>&5 |
4624 | + fi |
4625 | + $RM conftest* |
4626 | + ]) |
4627 | + _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) |
4628 | ;; |
4629 | esac |
4630 | fi |
4631 | @@ -5212,9 +5713,6 @@ |
4632 | _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], |
4633 | [Flag to hardcode $libdir into a binary during linking. |
4634 | This must work even if $libdir does not exist]) |
4635 | -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], |
4636 | - [[If ld is used when linking, flag to hardcode $libdir into a binary |
4637 | - during linking. This must work even if $libdir does not exist]]) |
4638 | _LT_TAGDECL([], [hardcode_libdir_separator], [1], |
4639 | [Whether we need a single "-rpath" flag with a separated argument]) |
4640 | _LT_TAGDECL([], [hardcode_direct], [0], |
4641 | @@ -5240,8 +5738,6 @@ |
4642 | to runtime path list]) |
4643 | _LT_TAGDECL([], [link_all_deplibs], [0], |
4644 | [Whether libtool must link a program against all its dependency libraries]) |
4645 | -_LT_TAGDECL([], [fix_srcfile_path], [1], |
4646 | - [Fix the shell variable $srcfile for the compiler]) |
4647 | _LT_TAGDECL([], [always_export_symbols], [0], |
4648 | [Set to "yes" if exported symbols are required]) |
4649 | _LT_TAGDECL([], [export_symbols_cmds], [2], |
4650 | @@ -5252,6 +5748,8 @@ |
4651 | [Symbols that must always be exported]) |
4652 | _LT_TAGDECL([], [prelink_cmds], [2], |
4653 | [Commands necessary for linking programs (against libraries) with templates]) |
4654 | +_LT_TAGDECL([], [postlink_cmds], [2], |
4655 | + [Commands necessary for finishing linking programs]) |
4656 | _LT_TAGDECL([], [file_list_spec], [1], |
4657 | [Specify filename containing input files]) |
4658 | dnl FIXME: Not yet implemented |
4659 | @@ -5341,14 +5839,15 @@ |
4660 | ])# _LT_LANG_C_CONFIG |
4661 | |
4662 | |
4663 | -# _LT_PROG_CXX |
4664 | -# ------------ |
4665 | -# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ |
4666 | -# compiler, we have our own version here. |
4667 | -m4_defun([_LT_PROG_CXX], |
4668 | -[ |
4669 | -pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) |
4670 | -AC_PROG_CXX |
4671 | +# _LT_LANG_CXX_CONFIG([TAG]) |
4672 | +# -------------------------- |
4673 | +# Ensure that the configuration variables for a C++ compiler are suitably |
4674 | +# defined. These variables are subsequently used by _LT_CONFIG to write |
4675 | +# the compiler configuration to `libtool'. |
4676 | +m4_defun([_LT_LANG_CXX_CONFIG], |
4677 | +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
4678 | +m4_require([_LT_DECL_EGREP])dnl |
4679 | +m4_require([_LT_PATH_MANIFEST_TOOL])dnl |
4680 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
4681 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
4682 | (test "X$CXX" != "Xg++"))) ; then |
4683 | @@ -5356,22 +5855,6 @@ |
4684 | else |
4685 | _lt_caught_CXX_error=yes |
4686 | fi |
4687 | -popdef([AC_MSG_ERROR]) |
4688 | -])# _LT_PROG_CXX |
4689 | - |
4690 | -dnl aclocal-1.4 backwards compatibility: |
4691 | -dnl AC_DEFUN([_LT_PROG_CXX], []) |
4692 | - |
4693 | - |
4694 | -# _LT_LANG_CXX_CONFIG([TAG]) |
4695 | -# -------------------------- |
4696 | -# Ensure that the configuration variables for a C++ compiler are suitably |
4697 | -# defined. These variables are subsequently used by _LT_CONFIG to write |
4698 | -# the compiler configuration to `libtool'. |
4699 | -m4_defun([_LT_LANG_CXX_CONFIG], |
4700 | -[AC_REQUIRE([_LT_PROG_CXX])dnl |
4701 | -m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
4702 | -m4_require([_LT_DECL_EGREP])dnl |
4703 | |
4704 | AC_LANG_PUSH(C++) |
4705 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
4706 | @@ -5383,7 +5866,6 @@ |
4707 | _LT_TAGVAR(hardcode_direct, $1)=no |
4708 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
4709 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
4710 | -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
4711 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
4712 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
4713 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
4714 | @@ -5393,6 +5875,8 @@ |
4715 | _LT_TAGVAR(module_expsym_cmds, $1)= |
4716 | _LT_TAGVAR(link_all_deplibs, $1)=unknown |
4717 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
4718 | +_LT_TAGVAR(reload_flag, $1)=$reload_flag |
4719 | +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds |
4720 | _LT_TAGVAR(no_undefined_flag, $1)= |
4721 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
4722 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no |
4723 | @@ -5424,6 +5908,7 @@ |
4724 | |
4725 | # Allow CC to be a program name with arguments. |
4726 | lt_save_CC=$CC |
4727 | + lt_save_CFLAGS=$CFLAGS |
4728 | lt_save_LD=$LD |
4729 | lt_save_GCC=$GCC |
4730 | GCC=$GXX |
4731 | @@ -5441,6 +5926,7 @@ |
4732 | fi |
4733 | test -z "${LDCXX+set}" || LD=$LDCXX |
4734 | CC=${CXX-"c++"} |
4735 | + CFLAGS=$CXXFLAGS |
4736 | compiler=$CC |
4737 | _LT_TAGVAR(compiler, $1)=$CC |
4738 | _LT_CC_BASENAME([$compiler]) |
4739 | @@ -5462,8 +5948,8 @@ |
4740 | # Check if GNU C++ uses GNU ld as the underlying linker, since the |
4741 | # archiving commands below assume that GNU ld is being used. |
4742 | if test "$with_gnu_ld" = yes; then |
4743 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4744 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4745 | + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4746 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4747 | |
4748 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
4749 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
4750 | @@ -5495,7 +5981,7 @@ |
4751 | # Commands to make compiler produce verbose output that lists |
4752 | # what "hidden" libraries, object files and flags are used when |
4753 | # linking a shared library. |
4754 | - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' |
4755 | + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
4756 | |
4757 | else |
4758 | GXX=no |
4759 | @@ -5604,10 +6090,10 @@ |
4760 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
4761 | # Determine the default libpath from the value encoded in an empty |
4762 | # executable. |
4763 | - _LT_SYS_MODULE_PATH_AIX |
4764 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
4765 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
4766 | |
4767 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
4768 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
4769 | else |
4770 | if test "$host_cpu" = ia64; then |
4771 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' |
4772 | @@ -5616,14 +6102,19 @@ |
4773 | else |
4774 | # Determine the default libpath from the value encoded in an |
4775 | # empty executable. |
4776 | - _LT_SYS_MODULE_PATH_AIX |
4777 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
4778 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
4779 | # Warning - without using the other run time loading flags, |
4780 | # -berok will link without error, but may produce a broken library. |
4781 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' |
4782 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' |
4783 | - # Exported symbols can be pulled into shared objects from archives |
4784 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
4785 | + if test "$with_gnu_ld" = yes; then |
4786 | + # We only use this code for GNU lds that support --whole-archive. |
4787 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' |
4788 | + else |
4789 | + # Exported symbols can be pulled into shared objects from archives |
4790 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
4791 | + fi |
4792 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
4793 | # This is similar to how AIX traditionally builds its shared |
4794 | # libraries. |
4795 | @@ -5653,28 +6144,75 @@ |
4796 | ;; |
4797 | |
4798 | cygwin* | mingw* | pw32* | cegcc*) |
4799 | - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
4800 | - # as there is no search path for DLLs. |
4801 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
4802 | - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
4803 | - _LT_TAGVAR(always_export_symbols, $1)=no |
4804 | - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
4805 | + case $GXX,$cc_basename in |
4806 | + ,cl* | no,cl*) |
4807 | + # Native MSVC |
4808 | + # hardcode_libdir_flag_spec is actually meaningless, as there is |
4809 | + # no search path for DLLs. |
4810 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
4811 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
4812 | + _LT_TAGVAR(always_export_symbols, $1)=yes |
4813 | + _LT_TAGVAR(file_list_spec, $1)='@' |
4814 | + # Tell ltmain to make .lib files, not .a files. |
4815 | + libext=lib |
4816 | + # Tell ltmain to make .dll files, not .so files. |
4817 | + shrext_cmds=".dll" |
4818 | + # FIXME: Setting linknames here is a bad hack. |
4819 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
4820 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
4821 | + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
4822 | + else |
4823 | + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
4824 | + fi~ |
4825 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
4826 | + linknames=' |
4827 | + # The linker will not automatically build a static lib if we build a DLL. |
4828 | + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
4829 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
4830 | + # Don't use ranlib |
4831 | + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' |
4832 | + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ |
4833 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
4834 | + case $lt_outputfile in |
4835 | + *.exe|*.EXE) ;; |
4836 | + *) |
4837 | + lt_outputfile="$lt_outputfile.exe" |
4838 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
4839 | + ;; |
4840 | + esac~ |
4841 | + func_to_tool_file "$lt_outputfile"~ |
4842 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
4843 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
4844 | + $RM "$lt_outputfile.manifest"; |
4845 | + fi' |
4846 | + ;; |
4847 | + *) |
4848 | + # g++ |
4849 | + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
4850 | + # as there is no search path for DLLs. |
4851 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
4852 | + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' |
4853 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
4854 | + _LT_TAGVAR(always_export_symbols, $1)=no |
4855 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
4856 | |
4857 | - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
4858 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
4859 | - # If the export-symbols file already is a .def file (1st line |
4860 | - # is EXPORTS), use it as is; otherwise, prepend... |
4861 | - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
4862 | - cp $export_symbols $output_objdir/$soname.def; |
4863 | - else |
4864 | - echo EXPORTS > $output_objdir/$soname.def; |
4865 | - cat $export_symbols >> $output_objdir/$soname.def; |
4866 | - fi~ |
4867 | - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
4868 | - else |
4869 | - _LT_TAGVAR(ld_shlibs, $1)=no |
4870 | - fi |
4871 | - ;; |
4872 | + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
4873 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
4874 | + # If the export-symbols file already is a .def file (1st line |
4875 | + # is EXPORTS), use it as is; otherwise, prepend... |
4876 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
4877 | + cp $export_symbols $output_objdir/$soname.def; |
4878 | + else |
4879 | + echo EXPORTS > $output_objdir/$soname.def; |
4880 | + cat $export_symbols >> $output_objdir/$soname.def; |
4881 | + fi~ |
4882 | + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
4883 | + else |
4884 | + _LT_TAGVAR(ld_shlibs, $1)=no |
4885 | + fi |
4886 | + ;; |
4887 | + esac |
4888 | + ;; |
4889 | darwin* | rhapsody*) |
4890 | _LT_DARWIN_LINKER_FEATURES($1) |
4891 | ;; |
4892 | @@ -5697,7 +6235,7 @@ |
4893 | esac |
4894 | ;; |
4895 | |
4896 | - freebsd[[12]]*) |
4897 | + freebsd2.*) |
4898 | # C++ shared libraries reported to be fairly broken before |
4899 | # switch to ELF |
4900 | _LT_TAGVAR(ld_shlibs, $1)=no |
4901 | @@ -5716,6 +6254,11 @@ |
4902 | gnu*) |
4903 | ;; |
4904 | |
4905 | + haiku*) |
4906 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4907 | + _LT_TAGVAR(link_all_deplibs, $1)=yes |
4908 | + ;; |
4909 | + |
4910 | hpux9*) |
4911 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
4912 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: |
4913 | @@ -5740,11 +6283,11 @@ |
4914 | # explicitly linking system object files so we need to strip them |
4915 | # from the output so that they don't get included in the library |
4916 | # dependencies. |
4917 | - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
4918 | + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
4919 | ;; |
4920 | *) |
4921 | if test "$GXX" = yes; then |
4922 | - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
4923 | + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
4924 | else |
4925 | # FIXME: insert proper C++ library support |
4926 | _LT_TAGVAR(ld_shlibs, $1)=no |
4927 | @@ -5805,7 +6348,7 @@ |
4928 | # explicitly linking system object files so we need to strip them |
4929 | # from the output so that they don't get included in the library |
4930 | # dependencies. |
4931 | - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
4932 | + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
4933 | ;; |
4934 | *) |
4935 | if test "$GXX" = yes; then |
4936 | @@ -5815,10 +6358,10 @@ |
4937 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
4938 | ;; |
4939 | ia64*) |
4940 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
4941 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
4942 | ;; |
4943 | *) |
4944 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
4945 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
4946 | ;; |
4947 | esac |
4948 | fi |
4949 | @@ -5848,7 +6391,7 @@ |
4950 | case $cc_basename in |
4951 | CC*) |
4952 | # SGI C++ |
4953 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
4954 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
4955 | |
4956 | # Archives containing C++ object files must be created using |
4957 | # "CC -ar", where "CC" is the IRIX C++ compiler. This is |
4958 | @@ -5859,9 +6402,9 @@ |
4959 | *) |
4960 | if test "$GXX" = yes; then |
4961 | if test "$with_gnu_ld" = no; then |
4962 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4963 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4964 | else |
4965 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' |
4966 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' |
4967 | fi |
4968 | fi |
4969 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
4970 | @@ -5890,7 +6433,7 @@ |
4971 | # explicitly linking system object files so we need to strip them |
4972 | # from the output so that they don't get included in the library |
4973 | # dependencies. |
4974 | - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
4975 | + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
4976 | |
4977 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
4978 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
4979 | @@ -5927,26 +6470,26 @@ |
4980 | pgCC* | pgcpp*) |
4981 | # Portland Group C++ compiler |
4982 | case `$CC -V` in |
4983 | - *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) |
4984 | + *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) |
4985 | _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ |
4986 | rm -rf $tpldir~ |
4987 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ |
4988 | - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' |
4989 | + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' |
4990 | _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ |
4991 | rm -rf $tpldir~ |
4992 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ |
4993 | - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ |
4994 | + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ |
4995 | $RANLIB $oldlib' |
4996 | _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ |
4997 | rm -rf $tpldir~ |
4998 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
4999 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
5000 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
That diff is absolutely impossible to read. I wonder why some files are removed and reintroduced for no good reason in that diff (e.g. COPYING).
Still, the end result looks good and it builds fine.