Merge lp:~clint-fewbar/ubuntu/maverick/libdbi-drivers/merge-upstream-release-0.8.3-1 into lp:ubuntu/maverick/libdbi-drivers
- Maverick (10.10)
- merge-upstream-release-0.8.3-1
- Merge into maverick
Proposed by
Clint Byrum
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 6 | ||||
Proposed branch: | lp:~clint-fewbar/ubuntu/maverick/libdbi-drivers/merge-upstream-release-0.8.3-1 | ||||
Merge into: | lp:ubuntu/maverick/libdbi-drivers | ||||
Diff against target: | 63231 lines | ||||
To merge this branch: | bzr merge lp:~clint-fewbar/ubuntu/maverick/libdbi-drivers/merge-upstream-release-0.8.3-1 | ||||
Related bugs: |
|
||||
Related blueprints: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Server | Pending | ||
Ubuntu branches | Pending | ||
Review via email: mp+30674@code.launchpad.net |
Commit message
Description of the change
The sqlite3 driver in v0.8.2 has problems, this version fixes the integration with rrdtool that will be introduced when rrdtool v1.4.3-1 is merged.
To post a comment you must log in.
Revision history for this message
Stefano Rivera (stefanor) wrote : | # |
Revision history for this message
Clint Byrum (clint-fewbar) wrote : | # |
> Is there no chance of getting Debian to upload this version in the next couple
> of days?
Per the discussion here:
http://
I think there's definitely a chance. I will keep my fingers crossed. :)
Revision history for this message
Stefano Rivera (stefanor) wrote : | # |
Debian has now frozen, and I don't see any freeze exception noise about sqlite. Let's do this.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'COPYING' |
2 | --- COPYING 2007-11-26 06:09:08 +0000 |
3 | +++ COPYING 2010-07-22 15:29:47 +0000 |
4 | @@ -1,343 +1,515 @@ |
5 | -GNU General Public License |
6 | -************************** |
7 | - |
8 | - GNU GENERAL PUBLIC LICENSE |
9 | - Version 2, June 1991 |
10 | - |
11 | - Copyright (C) 1989, 1991 Free Software Foundation, Inc. |
12 | - 675 Mass Ave, Cambridge, MA 02139, USA |
13 | - Everyone is permitted to copy and distribute verbatim copies |
14 | - of this license document, but changing it is not allowed. |
15 | - |
16 | - Preamble |
17 | - |
18 | - The licenses for most software are designed to take away your |
19 | - freedom to share and change it. By contrast, the GNU General Public |
20 | - License is intended to guarantee your freedom to share and change free |
21 | - software--to make sure the software is free for all its users. This |
22 | - General Public License applies to most of the Free Software |
23 | - Foundation's software and to any other program whose authors commit to |
24 | - using it. (Some other Free Software Foundation software is covered by |
25 | - the GNU Library General Public License instead.) You can apply it to |
26 | - your programs, too. |
27 | - |
28 | - When we speak of free software, we are referring to freedom, not |
29 | - price. Our General Public Licenses are designed to make sure that you |
30 | - have the freedom to distribute copies of free software (and charge for |
31 | - this service if you wish), that you receive source code or can get it |
32 | - if you want it, that you can change the software or use pieces of it |
33 | - in new free programs; and that you know you can do these things. |
34 | - |
35 | - To protect your rights, we need to make restrictions that forbid |
36 | - anyone to deny you these rights or to ask you to surrender the rights. |
37 | - These restrictions translate to certain responsibilities for you if you |
38 | - distribute copies of the software, or if you modify it. |
39 | - |
40 | - For example, if you distribute copies of such a program, whether |
41 | - gratis or for a fee, you must give the recipients all the rights that |
42 | - you have. You must make sure that they, too, receive or can get the |
43 | - source code. And you must show them these terms so they know their |
44 | - rights. |
45 | - |
46 | - We protect your rights with two steps: (1) copyright the software, and |
47 | - (2) offer you this license which gives you legal permission to copy, |
48 | - distribute and/or modify the software. |
49 | - |
50 | - Also, for each author's protection and ours, we want to make certain |
51 | - that everyone understands that there is no warranty for this free |
52 | - software. If the software is modified by someone else and passed on, we |
53 | - want its recipients to know that what they have is not the original, so |
54 | - that any problems introduced by others will not reflect on the original |
55 | - authors' reputations. |
56 | - |
57 | - Finally, any free program is threatened constantly by software |
58 | - patents. We wish to avoid the danger that redistributors of a free |
59 | - program will individually obtain patent licenses, in effect making the |
60 | - program proprietary. To prevent this, we have made it clear that any |
61 | - patent must be licensed for everyone's free use or not licensed at all. |
62 | - |
63 | - The precise terms and conditions for copying, distribution and |
64 | - modification follow. |
65 | - |
66 | |
67 | - GNU GENERAL PUBLIC LICENSE |
68 | - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION |
69 | - |
70 | - 0. This License applies to any program or other work which contains |
71 | - a notice placed by the copyright holder saying it may be distributed |
72 | - under the terms of this General Public License. The "Program", below, |
73 | - refers to any such program or work, and a "work based on the Program" |
74 | - means either the Program or any derivative work under copyright law: |
75 | - that is to say, a work containing the Program or a portion of it, |
76 | - either verbatim or with modifications and/or translated into another |
77 | - language. (Hereinafter, translation is included without limitation in |
78 | - the term "modification".) Each licensee is addressed as "you". |
79 | - |
80 | - Activities other than copying, distribution and modification are not |
81 | - covered by this License; they are outside its scope. The act of |
82 | - running the Program is not restricted, and the output from the Program |
83 | - is covered only if its contents constitute a work based on the |
84 | - Program (independent of having been made by running the Program). |
85 | - Whether that is true depends on what the Program does. |
86 | - |
87 | - 1. You may copy and distribute verbatim copies of the Program's |
88 | - source code as you receive it, in any medium, provided that you |
89 | - conspicuously and appropriately publish on each copy an appropriate |
90 | - copyright notice and disclaimer of warranty; keep intact all the |
91 | - notices that refer to this License and to the absence of any warranty; |
92 | - and give any other recipients of the Program a copy of this License |
93 | - along with the Program. |
94 | - |
95 | - You may charge a fee for the physical act of transferring a copy, and |
96 | - you may at your option offer warranty protection in exchange for a fee. |
97 | - |
98 | - 2. You may modify your copy or copies of the Program or any portion |
99 | - of it, thus forming a work based on the Program, and copy and |
100 | - distribute such modifications or work under the terms of Section 1 |
101 | - above, provided that you also meet all of these conditions: |
102 | - |
103 | - a) You must cause the modified files to carry prominent notices |
104 | - stating that you changed the files and the date of any change. |
105 | - |
106 | - b) You must cause any work that you distribute or publish, that in |
107 | - whole or in part contains or is derived from the Program or any |
108 | - part thereof, to be licensed as a whole at no charge to all third |
109 | - parties under the terms of this License. |
110 | - |
111 | - c) If the modified program normally reads commands interactively |
112 | - when run, you must cause it, when started running for such |
113 | - interactive use in the most ordinary way, to print or display an |
114 | - announcement including an appropriate copyright notice and a |
115 | - notice that there is no warranty (or else, saying that you provide |
116 | - a warranty) and that users may redistribute the program under |
117 | - these conditions, and telling the user how to view a copy of this |
118 | - License. (Exception: if the Program itself is interactive but |
119 | - does not normally print such an announcement, your work based on |
120 | - the Program is not required to print an announcement.) |
121 | - |
122 | |
123 | - These requirements apply to the modified work as a whole. If |
124 | - identifiable sections of that work are not derived from the Program, |
125 | - and can be reasonably considered independent and separate works in |
126 | - themselves, then this License, and its terms, do not apply to those |
127 | - sections when you distribute them as separate works. But when you |
128 | - distribute the same sections as part of a whole which is a work based |
129 | - on the Program, the distribution of the whole must be on the terms of |
130 | - this License, whose permissions for other licensees extend to the |
131 | - entire whole, and thus to each and every part regardless of who wrote it. |
132 | - |
133 | - Thus, it is not the intent of this section to claim rights or contest |
134 | - your rights to work written entirely by you; rather, the intent is to |
135 | - exercise the right to control the distribution of derivative or |
136 | - collective works based on the Program. |
137 | - |
138 | - In addition, mere aggregation of another work not based on the Program |
139 | - with the Program (or with a work based on the Program) on a volume of |
140 | - a storage or distribution medium does not bring the other work under |
141 | - the scope of this License. |
142 | - |
143 | - 3. You may copy and distribute the Program (or a work based on it, |
144 | - under Section 2) in object code or executable form under the terms of |
145 | - Sections 1 and 2 above provided that you also do one of the following: |
146 | - |
147 | - a) Accompany it with the complete corresponding machine-readable |
148 | - source code, which must be distributed under the terms of Sections |
149 | - 1 and 2 above on a medium customarily used for software interchange; or, |
150 | - |
151 | - b) Accompany it with a written offer, valid for at least three |
152 | - years, to give any third party, for a charge no more than your |
153 | - cost of physically performing source distribution, a complete |
154 | - machine-readable copy of the corresponding source code, to be |
155 | - distributed under the terms of Sections 1 and 2 above on a medium |
156 | - customarily used for software interchange; or, |
157 | - |
158 | - c) Accompany it with the information you received as to the offer |
159 | - to distribute corresponding source code. (This alternative is |
160 | - allowed only for noncommercial distribution and only if you |
161 | - received the program in object code or executable form with such |
162 | - an offer, in accord with Subsection b above.) |
163 | - |
164 | - The source code for a work means the preferred form of the work for |
165 | - making modifications to it. For an executable work, complete source |
166 | - code means all the source code for all modules it contains, plus any |
167 | - associated interface definition files, plus the scripts used to |
168 | - control compilation and installation of the executable. However, as a |
169 | - special exception, the source code distributed need not include |
170 | - anything that is normally distributed (in either source or binary |
171 | - form) with the major components (compiler, kernel, and so on) of the |
172 | - operating system on which the executable runs, unless that component |
173 | - itself accompanies the executable. |
174 | - |
175 | - If distribution of executable or object code is made by offering |
176 | - access to copy from a designated place, then offering equivalent |
177 | - access to copy the source code from the same place counts as |
178 | - distribution of the source code, even though third parties are not |
179 | - compelled to copy the source along with the object code. |
180 | - |
181 | |
182 | - 4. You may not copy, modify, sublicense, or distribute the Program |
183 | - except as expressly provided under this License. Any attempt |
184 | - otherwise to copy, modify, sublicense or distribute the Program is |
185 | - void, and will automatically terminate your rights under this License. |
186 | - However, parties who have received copies, or rights, from you under |
187 | - this License will not have their licenses terminated so long as such |
188 | - parties remain in full compliance. |
189 | - |
190 | - 5. You are not required to accept this License, since you have not |
191 | - signed it. However, nothing else grants you permission to modify or |
192 | - distribute the Program or its derivative works. These actions are |
193 | - prohibited by law if you do not accept this License. Therefore, by |
194 | - modifying or distributing the Program (or any work based on the |
195 | - Program), you indicate your acceptance of this License to do so, and |
196 | - all its terms and conditions for copying, distributing or modifying |
197 | - the Program or works based on it. |
198 | - |
199 | - 6. Each time you redistribute the Program (or any work based on the |
200 | - Program), the recipient automatically receives a license from the |
201 | - original licensor to copy, distribute or modify the Program subject to |
202 | - these terms and conditions. You may not impose any further |
203 | - restrictions on the recipients' exercise of the rights granted herein. |
204 | - You are not responsible for enforcing compliance by third parties to |
205 | - this License. |
206 | - |
207 | - 7. If, as a consequence of a court judgment or allegation of patent |
208 | - infringement or for any other reason (not limited to patent issues), |
209 | - conditions are imposed on you (whether by court order, agreement or |
210 | - otherwise) that contradict the conditions of this License, they do not |
211 | - excuse you from the conditions of this License. If you cannot |
212 | - distribute so as to satisfy simultaneously your obligations under this |
213 | - License and any other pertinent obligations, then as a consequence you |
214 | - may not distribute the Program at all. For example, if a patent |
215 | - license would not permit royalty-free redistribution of the Program by |
216 | - all those who receive copies directly or indirectly through you, then |
217 | - the only way you could satisfy both it and this License would be to |
218 | - refrain entirely from distribution of the Program. |
219 | - |
220 | - If any portion of this section is held invalid or unenforceable under |
221 | - any particular circumstance, the balance of the section is intended to |
222 | - apply and the section as a whole is intended to apply in other |
223 | - circumstances. |
224 | - |
225 | - It is not the purpose of this section to induce you to infringe any |
226 | - patents or other property right claims or to contest validity of any |
227 | - such claims; this section has the sole purpose of protecting the |
228 | - integrity of the free software distribution system, which is |
229 | - implemented by public license practices. Many people have made |
230 | - generous contributions to the wide range of software distributed |
231 | - through that system in reliance on consistent application of that |
232 | - system; it is up to the author/donor to decide if he or she is willing |
233 | - to distribute software through any other system and a licensee cannot |
234 | - impose that choice. |
235 | - |
236 | - This section is intended to make thoroughly clear what is believed to |
237 | - be a consequence of the rest of this License. |
238 | - |
239 | |
240 | - 8. If the distribution and/or use of the Program is restricted in |
241 | - certain countries either by patents or by copyrighted interfaces, the |
242 | - original copyright holder who places the Program under this License |
243 | - may add an explicit geographical distribution limitation excluding |
244 | - those countries, so that distribution is permitted only in or among |
245 | - countries not thus excluded. In such case, this License incorporates |
246 | - the limitation as if written in the body of this License. |
247 | - |
248 | - 9. The Free Software Foundation may publish revised and/or new versions |
249 | - of the General Public License from time to time. Such new versions will |
250 | - be similar in spirit to the present version, but may differ in detail to |
251 | - address new problems or concerns. |
252 | - |
253 | - Each version is given a distinguishing version number. If the Program |
254 | - specifies a version number of this License which applies to it and "any |
255 | - later version", you have the option of following the terms and conditions |
256 | - either of that version or of any later version published by the Free |
257 | - Software Foundation. If the Program does not specify a version number of |
258 | - this License, you may choose any version ever published by the Free Software |
259 | - Foundation. |
260 | - |
261 | - 10. If you wish to incorporate parts of the Program into other free |
262 | - programs whose distribution conditions are different, write to the author |
263 | - to ask for permission. For software which is copyrighted by the Free |
264 | - Software Foundation, write to the Free Software Foundation; we sometimes |
265 | - make exceptions for this. Our decision will be guided by the two goals |
266 | - of preserving the free status of all derivatives of our free software and |
267 | - of promoting the sharing and reuse of software generally. |
268 | - |
269 | - NO WARRANTY |
270 | - |
271 | - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY |
272 | - FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN |
273 | - OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES |
274 | - PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED |
275 | - OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
276 | - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS |
277 | - TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE |
278 | - PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, |
279 | - REPAIR OR CORRECTION. |
280 | - |
281 | - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING |
282 | - WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR |
283 | - REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, |
284 | - INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING |
285 | - OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED |
286 | - TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY |
287 | - YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER |
288 | - PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE |
289 | - POSSIBILITY OF SUCH DAMAGES. |
290 | - |
291 | - END OF TERMS AND CONDITIONS |
292 | - |
293 | |
294 | - Appendix: How to Apply These Terms to Your New Programs |
295 | - |
296 | - If you develop a new program, and you want it to be of the greatest |
297 | - possible use to the public, the best way to achieve this is to make it |
298 | - free software which everyone can redistribute and change under these terms. |
299 | - |
300 | - To do so, attach the following notices to the program. It is safest |
301 | - to attach them to the start of each source file to most effectively |
302 | - convey the exclusion of warranty; and each file should have at least |
303 | - the "copyright" line and a pointer to where the full notice is found. |
304 | - |
305 | - <one line to give the program's name and a brief idea of what it does.> |
306 | - Copyright (C) 19yy <name of author> |
307 | - |
308 | - This program is free software; you can redistribute it and/or modify |
309 | - it under the terms of the GNU General Public License as published by |
310 | - the Free Software Foundation; either version 2 of the License, or |
311 | - (at your option) any later version. |
312 | - |
313 | - This program is distributed in the hope that it will be useful, |
314 | - but WITHOUT ANY WARRANTY; without even the implied warranty of |
315 | - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
316 | - GNU General Public License for more details. |
317 | - |
318 | - You should have received a copy of the GNU General Public License |
319 | - along with this program; if not, write to the Free Software |
320 | - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
321 | - |
322 | - Also add information on how to contact you by electronic and paper mail. |
323 | - |
324 | - If the program is interactive, make it output a short notice like this |
325 | - when it starts in an interactive mode: |
326 | - |
327 | - Gnomovision version 69, Copyright (C) 19yy name of author |
328 | - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. |
329 | - This is free software, and you are welcome to redistribute it |
330 | - under certain conditions; type `show c' for details. |
331 | - |
332 | - The hypothetical commands `show w' and `show c' should show the appropriate |
333 | - parts of the General Public License. Of course, the commands you use may |
334 | - be called something other than `show w' and `show c'; they could even be |
335 | - mouse-clicks or menu items--whatever suits your program. |
336 | - |
337 | - You should also get your employer (if you work as a programmer) or your |
338 | - school, if any, to sign a "copyright disclaimer" for the program, if |
339 | - necessary. Here is a sample; alter the names: |
340 | - |
341 | - Yoyodyne, Inc., hereby disclaims all copyright interest in the program |
342 | - `Gnomovision' (which makes passes at compilers) written by James Hacker. |
343 | - |
344 | - <signature of Ty Coon>, 1 April 1989 |
345 | - Ty Coon, President of Vice |
346 | - |
347 | - This General Public License does not permit incorporating your program into |
348 | - proprietary programs. If your program is a subroutine library, you may |
349 | - consider it more useful to permit linking proprietary applications with the |
350 | - library. If this is what you want to do, use the GNU Library General |
351 | - Public License instead of this License. |
352 | + |
353 | + GNU LESSER GENERAL PUBLIC LICENSE |
354 | + Version 2.1, February 1999 |
355 | + |
356 | + Copyright (C) 1991, 1999 Free Software Foundation, Inc. |
357 | + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
358 | + Everyone is permitted to copy and distribute verbatim copies |
359 | + of this license document, but changing it is not allowed. |
360 | + |
361 | +[This is the first released version of the Lesser GPL. It also counts |
362 | + as the successor of the GNU Library Public License, version 2, hence |
363 | + the version number 2.1.] |
364 | + |
365 | + Preamble |
366 | + |
367 | + The licenses for most software are designed to take away your |
368 | +freedom to share and change it. By contrast, the GNU General Public |
369 | +Licenses are intended to guarantee your freedom to share and change |
370 | +free software--to make sure the software is free for all its users. |
371 | + |
372 | + This license, the Lesser General Public License, applies to some |
373 | +specially designated software packages--typically libraries--of the |
374 | +Free Software Foundation and other authors who decide to use it. You |
375 | +can use it too, but we suggest you first think carefully about whether |
376 | +this license or the ordinary General Public License is the better |
377 | +strategy to use in any particular case, based on the explanations |
378 | +below. |
379 | + |
380 | + When we speak of free software, we are referring to freedom of use, |
381 | +not price. Our General Public Licenses are designed to make sure that |
382 | +you have the freedom to distribute copies of free software (and charge |
383 | +for this service if you wish); that you receive source code or can get |
384 | +it if you want it; that you can change the software and use pieces of |
385 | +it in new free programs; and that you are informed that you can do |
386 | +these things. |
387 | + |
388 | + To protect your rights, we need to make restrictions that forbid |
389 | +distributors to deny you these rights or to ask you to surrender these |
390 | +rights. These restrictions translate to certain responsibilities for |
391 | +you if you distribute copies of the library or if you modify it. |
392 | + |
393 | + For example, if you distribute copies of the library, whether gratis |
394 | +or for a fee, you must give the recipients all the rights that we gave |
395 | +you. You must make sure that they, too, receive or can get the source |
396 | +code. If you link other code with the library, you must provide |
397 | +complete object files to the recipients, so that they can relink them |
398 | +with the library after making changes to the library and recompiling |
399 | +it. And you must show them these terms so they know their rights. |
400 | + |
401 | + We protect your rights with a two-step method: (1) we copyright the |
402 | +library, and (2) we offer you this license, which gives you legal |
403 | +permission to copy, distribute and/or modify the library. |
404 | + |
405 | + To protect each distributor, we want to make it very clear that |
406 | +there is no warranty for the free library. Also, if the library is |
407 | +modified by someone else and passed on, the recipients should know |
408 | +that what they have is not the original version, so that the original |
409 | +author's reputation will not be affected by problems that might be |
410 | +introduced by others. |
411 | +^L |
412 | + Finally, software patents pose a constant threat to the existence of |
413 | +any free program. We wish to make sure that a company cannot |
414 | +effectively restrict the users of a free program by obtaining a |
415 | +restrictive license from a patent holder. Therefore, we insist that |
416 | +any patent license obtained for a version of the library must be |
417 | +consistent with the full freedom of use specified in this license. |
418 | + |
419 | + Most GNU software, including some libraries, is covered by the |
420 | +ordinary GNU General Public License. This license, the GNU Lesser |
421 | +General Public License, applies to certain designated libraries, and |
422 | +is quite different from the ordinary General Public License. We use |
423 | +this license for certain libraries in order to permit linking those |
424 | +libraries into non-free programs. |
425 | + |
426 | + When a program is linked with a library, whether statically or using |
427 | +a shared library, the combination of the two is legally speaking a |
428 | +combined work, a derivative of the original library. The ordinary |
429 | +General Public License therefore permits such linking only if the |
430 | +entire combination fits its criteria of freedom. The Lesser General |
431 | +Public License permits more lax criteria for linking other code with |
432 | +the library. |
433 | + |
434 | + We call this license the "Lesser" General Public License because it |
435 | +does Less to protect the user's freedom than the ordinary General |
436 | +Public License. It also provides other free software developers Less |
437 | +of an advantage over competing non-free programs. These disadvantages |
438 | +are the reason we use the ordinary General Public License for many |
439 | +libraries. However, the Lesser license provides advantages in certain |
440 | +special circumstances. |
441 | + |
442 | + For example, on rare occasions, there may be a special need to |
443 | +encourage the widest possible use of a certain library, so that it |
444 | +becomes |
445 | +a de-facto standard. To achieve this, non-free programs must be |
446 | +allowed to use the library. A more frequent case is that a free |
447 | +library does the same job as widely used non-free libraries. In this |
448 | +case, there is little to gain by limiting the free library to free |
449 | +software only, so we use the Lesser General Public License. |
450 | + |
451 | + In other cases, permission to use a particular library in non-free |
452 | +programs enables a greater number of people to use a large body of |
453 | +free software. For example, permission to use the GNU C Library in |
454 | +non-free programs enables many more people to use the whole GNU |
455 | +operating system, as well as its variant, the GNU/Linux operating |
456 | +system. |
457 | + |
458 | + Although the Lesser General Public License is Less protective of the |
459 | +users' freedom, it does ensure that the user of a program that is |
460 | +linked with the Library has the freedom and the wherewithal to run |
461 | +that program using a modified version of the Library. |
462 | + |
463 | + The precise terms and conditions for copying, distribution and |
464 | +modification follow. Pay close attention to the difference between a |
465 | +"work based on the library" and a "work that uses the library". The |
466 | +former contains code derived from the library, whereas the latter must |
467 | +be combined with the library in order to run. |
468 | +^L |
469 | + GNU LESSER GENERAL PUBLIC LICENSE |
470 | + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION |
471 | + |
472 | + 0. This License Agreement applies to any software library or other |
473 | +program which contains a notice placed by the copyright holder or |
474 | +other authorized party saying it may be distributed under the terms of |
475 | +this Lesser General Public License (also called "this License"). |
476 | +Each licensee is addressed as "you". |
477 | + |
478 | + A "library" means a collection of software functions and/or data |
479 | +prepared so as to be conveniently linked with application programs |
480 | +(which use some of those functions and data) to form executables. |
481 | + |
482 | + The "Library", below, refers to any such software library or work |
483 | +which has been distributed under these terms. A "work based on the |
484 | +Library" means either the Library or any derivative work under |
485 | +copyright law: that is to say, a work containing the Library or a |
486 | +portion of it, either verbatim or with modifications and/or translated |
487 | +straightforwardly into another language. (Hereinafter, translation is |
488 | +included without limitation in the term "modification".) |
489 | + |
490 | + "Source code" for a work means the preferred form of the work for |
491 | +making modifications to it. For a library, complete source code means |
492 | +all the source code for all modules it contains, plus any associated |
493 | +interface definition files, plus the scripts used to control |
494 | +compilation |
495 | +and installation of the library. |
496 | + |
497 | + Activities other than copying, distribution and modification are not |
498 | +covered by this License; they are outside its scope. The act of |
499 | +running a program using the Library is not restricted, and output from |
500 | +such a program is covered only if its contents constitute a work based |
501 | +on the Library (independent of the use of the Library in a tool for |
502 | +writing it). Whether that is true depends on what the Library does |
503 | +and what the program that uses the Library does. |
504 | + |
505 | + 1. You may copy and distribute verbatim copies of the Library's |
506 | +complete source code as you receive it, in any medium, provided that |
507 | +you conspicuously and appropriately publish on each copy an |
508 | +appropriate copyright notice and disclaimer of warranty; keep intact |
509 | +all the notices that refer to this License and to the absence of any |
510 | +warranty; and distribute a copy of this License along with the |
511 | +Library. |
512 | + |
513 | + You may charge a fee for the physical act of transferring a copy, |
514 | +and you may at your option offer warranty protection in exchange for a |
515 | +fee. |
516 | + |
517 | |
518 | + 2. You may modify your copy or copies of the Library or any portion |
519 | +of it, thus forming a work based on the Library, and copy and |
520 | +distribute such modifications or work under the terms of Section 1 |
521 | +above, provided that you also meet all of these conditions: |
522 | + |
523 | + a) The modified work must itself be a software library. |
524 | + |
525 | + b) You must cause the files modified to carry prominent notices |
526 | + stating that you changed the files and the date of any change. |
527 | + |
528 | + c) You must cause the whole of the work to be licensed at no |
529 | + charge to all third parties under the terms of this License. |
530 | + |
531 | + d) If a facility in the modified Library refers to a function or a |
532 | + table of data to be supplied by an application program that uses |
533 | + the facility, other than as an argument passed when the facility |
534 | + is invoked, then you must make a good faith effort to ensure that, |
535 | + in the event an application does not supply such function or |
536 | + table, the facility still operates, and performs whatever part of |
537 | + its purpose remains meaningful. |
538 | + |
539 | + (For example, a function in a library to compute square roots has |
540 | + a purpose that is entirely well-defined independent of the |
541 | + application. Therefore, Subsection 2d requires that any |
542 | + application-supplied function or table used by this function must |
543 | + be optional: if the application does not supply it, the square |
544 | + root function must still compute square roots.) |
545 | + |
546 | +These requirements apply to the modified work as a whole. If |
547 | +identifiable sections of that work are not derived from the Library, |
548 | +and can be reasonably considered independent and separate works in |
549 | +themselves, then this License, and its terms, do not apply to those |
550 | +sections when you distribute them as separate works. But when you |
551 | +distribute the same sections as part of a whole which is a work based |
552 | +on the Library, the distribution of the whole must be on the terms of |
553 | +this License, whose permissions for other licensees extend to the |
554 | +entire whole, and thus to each and every part regardless of who wrote |
555 | +it. |
556 | + |
557 | +Thus, it is not the intent of this section to claim rights or contest |
558 | +your rights to work written entirely by you; rather, the intent is to |
559 | +exercise the right to control the distribution of derivative or |
560 | +collective works based on the Library. |
561 | + |
562 | +In addition, mere aggregation of another work not based on the Library |
563 | +with the Library (or with a work based on the Library) on a volume of |
564 | +a storage or distribution medium does not bring the other work under |
565 | +the scope of this License. |
566 | + |
567 | + 3. You may opt to apply the terms of the ordinary GNU General Public |
568 | +License instead of this License to a given copy of the Library. To do |
569 | +this, you must alter all the notices that refer to this License, so |
570 | +that they refer to the ordinary GNU General Public License, version 2, |
571 | +instead of to this License. (If a newer version than version 2 of the |
572 | +ordinary GNU General Public License has appeared, then you can specify |
573 | +that version instead if you wish.) Do not make any other change in |
574 | +these notices. |
575 | +^L |
576 | + Once this change is made in a given copy, it is irreversible for |
577 | +that copy, so the ordinary GNU General Public License applies to all |
578 | +subsequent copies and derivative works made from that copy. |
579 | + |
580 | + This option is useful when you wish to copy part of the code of |
581 | +the Library into a program that is not a library. |
582 | + |
583 | + 4. You may copy and distribute the Library (or a portion or |
584 | +derivative of it, under Section 2) in object code or executable form |
585 | +under the terms of Sections 1 and 2 above provided that you accompany |
586 | +it with the complete corresponding machine-readable source code, which |
587 | +must be distributed under the terms of Sections 1 and 2 above on a |
588 | +medium customarily used for software interchange. |
589 | + |
590 | + If distribution of object code is made by offering access to copy |
591 | +from a designated place, then offering equivalent access to copy the |
592 | +source code from the same place satisfies the requirement to |
593 | +distribute the source code, even though third parties are not |
594 | +compelled to copy the source along with the object code. |
595 | + |
596 | + 5. A program that contains no derivative of any portion of the |
597 | +Library, but is designed to work with the Library by being compiled or |
598 | +linked with it, is called a "work that uses the Library". Such a |
599 | +work, in isolation, is not a derivative work of the Library, and |
600 | +therefore falls outside the scope of this License. |
601 | + |
602 | + However, linking a "work that uses the Library" with the Library |
603 | +creates an executable that is a derivative of the Library (because it |
604 | +contains portions of the Library), rather than a "work that uses the |
605 | +library". The executable is therefore covered by this License. |
606 | +Section 6 states terms for distribution of such executables. |
607 | + |
608 | + When a "work that uses the Library" uses material from a header file |
609 | +that is part of the Library, the object code for the work may be a |
610 | +derivative work of the Library even though the source code is not. |
611 | +Whether this is true is especially significant if the work can be |
612 | +linked without the Library, or if the work is itself a library. The |
613 | +threshold for this to be true is not precisely defined by law. |
614 | + |
615 | + If such an object file uses only numerical parameters, data |
616 | +structure layouts and accessors, and small macros and small inline |
617 | +functions (ten lines or less in length), then the use of the object |
618 | +file is unrestricted, regardless of whether it is legally a derivative |
619 | +work. (Executables containing this object code plus portions of the |
620 | +Library will still fall under Section 6.) |
621 | + |
622 | + Otherwise, if the work is a derivative of the Library, you may |
623 | +distribute the object code for the work under the terms of Section 6. |
624 | +Any executables containing that work also fall under Section 6, |
625 | +whether or not they are linked directly with the Library itself. |
626 | +^L |
627 | + 6. As an exception to the Sections above, you may also combine or |
628 | +link a "work that uses the Library" with the Library to produce a |
629 | +work containing portions of the Library, and distribute that work |
630 | +under terms of your choice, provided that the terms permit |
631 | +modification of the work for the customer's own use and reverse |
632 | +engineering for debugging such modifications. |
633 | + |
634 | + You must give prominent notice with each copy of the work that the |
635 | +Library is used in it and that the Library and its use are covered by |
636 | +this License. You must supply a copy of this License. If the work |
637 | +during execution displays copyright notices, you must include the |
638 | +copyright notice for the Library among them, as well as a reference |
639 | +directing the user to the copy of this License. Also, you must do one |
640 | +of these things: |
641 | + |
642 | + a) Accompany the work with the complete corresponding |
643 | + machine-readable source code for the Library including whatever |
644 | + changes were used in the work (which must be distributed under |
645 | + Sections 1 and 2 above); and, if the work is an executable linked |
646 | + with the Library, with the complete machine-readable "work that |
647 | + uses the Library", as object code and/or source code, so that the |
648 | + user can modify the Library and then relink to produce a modified |
649 | + executable containing the modified Library. (It is understood |
650 | + that the user who changes the contents of definitions files in the |
651 | + Library will not necessarily be able to recompile the application |
652 | + to use the modified definitions.) |
653 | + |
654 | + b) Use a suitable shared library mechanism for linking with the |
655 | + Library. A suitable mechanism is one that (1) uses at run time a |
656 | + copy of the library already present on the user's computer system, |
657 | + rather than copying library functions into the executable, and (2) |
658 | + will operate properly with a modified version of the library, if |
659 | + the user installs one, as long as the modified version is |
660 | + interface-compatible with the version that the work was made with. |
661 | + |
662 | + c) Accompany the work with a written offer, valid for at |
663 | + least three years, to give the same user the materials |
664 | + specified in Subsection 6a, above, for a charge no more |
665 | + than the cost of performing this distribution. |
666 | + |
667 | + d) If distribution of the work is made by offering access to copy |
668 | + from a designated place, offer equivalent access to copy the above |
669 | + specified materials from the same place. |
670 | + |
671 | + e) Verify that the user has already received a copy of these |
672 | + materials or that you have already sent this user a copy. |
673 | + |
674 | + For an executable, the required form of the "work that uses the |
675 | +Library" must include any data and utility programs needed for |
676 | +reproducing the executable from it. However, as a special exception, |
677 | +the materials to be distributed need not include anything that is |
678 | +normally distributed (in either source or binary form) with the major |
679 | +components (compiler, kernel, and so on) of the operating system on |
680 | +which the executable runs, unless that component itself accompanies |
681 | +the executable. |
682 | + |
683 | + It may happen that this requirement contradicts the license |
684 | +restrictions of other proprietary libraries that do not normally |
685 | +accompany the operating system. Such a contradiction means you cannot |
686 | +use both them and the Library together in an executable that you |
687 | +distribute. |
688 | +^L |
689 | + 7. You may place library facilities that are a work based on the |
690 | +Library side-by-side in a single library together with other library |
691 | +facilities not covered by this License, and distribute such a combined |
692 | +library, provided that the separate distribution of the work based on |
693 | +the Library and of the other library facilities is otherwise |
694 | +permitted, and provided that you do these two things: |
695 | + |
696 | + a) Accompany the combined library with a copy of the same work |
697 | + based on the Library, uncombined with any other library |
698 | + facilities. This must be distributed under the terms of the |
699 | + Sections above. |
700 | + |
701 | + b) Give prominent notice with the combined library of the fact |
702 | + that part of it is a work based on the Library, and explaining |
703 | + where to find the accompanying uncombined form of the same work. |
704 | + |
705 | + 8. You may not copy, modify, sublicense, link with, or distribute |
706 | +the Library except as expressly provided under this License. Any |
707 | +attempt otherwise to copy, modify, sublicense, link with, or |
708 | +distribute the Library is void, and will automatically terminate your |
709 | +rights under this License. However, parties who have received copies, |
710 | +or rights, from you under this License will not have their licenses |
711 | +terminated so long as such parties remain in full compliance. |
712 | + |
713 | + 9. You are not required to accept this License, since you have not |
714 | +signed it. However, nothing else grants you permission to modify or |
715 | +distribute the Library or its derivative works. These actions are |
716 | +prohibited by law if you do not accept this License. Therefore, by |
717 | +modifying or distributing the Library (or any work based on the |
718 | +Library), you indicate your acceptance of this License to do so, and |
719 | +all its terms and conditions for copying, distributing or modifying |
720 | +the Library or works based on it. |
721 | + |
722 | + 10. Each time you redistribute the Library (or any work based on the |
723 | +Library), the recipient automatically receives a license from the |
724 | +original licensor to copy, distribute, link with or modify the Library |
725 | +subject to these terms and conditions. You may not impose any further |
726 | +restrictions on the recipients' exercise of the rights granted herein. |
727 | +You are not responsible for enforcing compliance by third parties with |
728 | +this License. |
729 | +^L |
730 | + 11. If, as a consequence of a court judgment or allegation of patent |
731 | +infringement or for any other reason (not limited to patent issues), |
732 | +conditions are imposed on you (whether by court order, agreement or |
733 | +otherwise) that contradict the conditions of this License, they do not |
734 | +excuse you from the conditions of this License. If you cannot |
735 | +distribute so as to satisfy simultaneously your obligations under this |
736 | +License and any other pertinent obligations, then as a consequence you |
737 | +may not distribute the Library at all. For example, if a patent |
738 | +license would not permit royalty-free redistribution of the Library by |
739 | +all those who receive copies directly or indirectly through you, then |
740 | +the only way you could satisfy both it and this License would be to |
741 | +refrain entirely from distribution of the Library. |
742 | + |
743 | +If any portion of this section is held invalid or unenforceable under |
744 | +any particular circumstance, the balance of the section is intended to |
745 | +apply, and the section as a whole is intended to apply in other |
746 | +circumstances. |
747 | + |
748 | +It is not the purpose of this section to induce you to infringe any |
749 | +patents or other property right claims or to contest validity of any |
750 | +such claims; this section has the sole purpose of protecting the |
751 | +integrity of the free software distribution system which is |
752 | +implemented by public license practices. Many people have made |
753 | +generous contributions to the wide range of software distributed |
754 | +through that system in reliance on consistent application of that |
755 | +system; it is up to the author/donor to decide if he or she is willing |
756 | +to distribute software through any other system and a licensee cannot |
757 | +impose that choice. |
758 | + |
759 | +This section is intended to make thoroughly clear what is believed to |
760 | +be a consequence of the rest of this License. |
761 | + |
762 | + 12. If the distribution and/or use of the Library is restricted in |
763 | +certain countries either by patents or by copyrighted interfaces, the |
764 | +original copyright holder who places the Library under this License |
765 | +may add an explicit geographical distribution limitation excluding those |
766 | +countries, so that distribution is permitted only in or among |
767 | +countries not thus excluded. In such case, this License incorporates |
768 | +the limitation as if written in the body of this License. |
769 | + |
770 | + 13. The Free Software Foundation may publish revised and/or new |
771 | +versions of the Lesser General Public License from time to time. |
772 | +Such new versions will be similar in spirit to the present version, |
773 | +but may differ in detail to address new problems or concerns. |
774 | + |
775 | +Each version is given a distinguishing version number. If the Library |
776 | +specifies a version number of this License which applies to it and |
777 | +"any later version", you have the option of following the terms and |
778 | +conditions either of that version or of any later version published by |
779 | +the Free Software Foundation. If the Library does not specify a |
780 | +license version number, you may choose any version ever published by |
781 | +the Free Software Foundation. |
782 | +^L |
783 | + 14. If you wish to incorporate parts of the Library into other free |
784 | +programs whose distribution conditions are incompatible with these, |
785 | +write to the author to ask for permission. For software which is |
786 | +copyrighted by the Free Software Foundation, write to the Free |
787 | +Software Foundation; we sometimes make exceptions for this. Our |
788 | +decision will be guided by the two goals of preserving the free status |
789 | +of all derivatives of our free software and of promoting the sharing |
790 | +and reuse of software generally. |
791 | + |
792 | + NO WARRANTY |
793 | + |
794 | + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO |
795 | +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. |
796 | +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR |
797 | +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY |
798 | +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE |
799 | +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
800 | +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE |
801 | +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME |
802 | +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. |
803 | + |
804 | + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN |
805 | +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY |
806 | +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU |
807 | +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR |
808 | +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE |
809 | +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING |
810 | +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A |
811 | +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF |
812 | +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH |
813 | +DAMAGES. |
814 | + |
815 | + END OF TERMS AND CONDITIONS |
816 | +^L |
817 | + How to Apply These Terms to Your New Libraries |
818 | + |
819 | + If you develop a new library, and you want it to be of the greatest |
820 | +possible use to the public, we recommend making it free software that |
821 | +everyone can redistribute and change. You can do so by permitting |
822 | +redistribution under these terms (or, alternatively, under the terms |
823 | +of the ordinary General Public License). |
824 | + |
825 | + To apply these terms, attach the following notices to the library. |
826 | +It is safest to attach them to the start of each source file to most |
827 | +effectively convey the exclusion of warranty; and each file should |
828 | +have at least the "copyright" line and a pointer to where the full |
829 | +notice is found. |
830 | + |
831 | + |
832 | + <one line to give the library's name and a brief idea of what it |
833 | +does.> |
834 | + Copyright (C) <year> <name of author> |
835 | + |
836 | + This library is free software; you can redistribute it and/or |
837 | + modify it under the terms of the GNU Lesser General Public |
838 | + License as published by the Free Software Foundation; either |
839 | + version 2 of the License, or (at your option) any later version. |
840 | + |
841 | + This library is distributed in the hope that it will be useful, |
842 | + but WITHOUT ANY WARRANTY; without even the implied warranty of |
843 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
844 | + Lesser General Public License for more details. |
845 | + |
846 | + You should have received a copy of the GNU Lesser General Public |
847 | + License along with this library; if not, write to the Free Software |
848 | + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
849 | + |
850 | +Also add information on how to contact you by electronic and paper |
851 | +mail. |
852 | + |
853 | +You should also get your employer (if you work as a programmer) or |
854 | +your |
855 | +school, if any, to sign a "copyright disclaimer" for the library, if |
856 | +necessary. Here is a sample; alter the names: |
857 | + |
858 | + Yoyodyne, Inc., hereby disclaims all copyright interest in the |
859 | + library `Frob' (a library for tweaking knobs) written by James |
860 | +Random Hacker. |
861 | + |
862 | + <signature of Ty Coon>, 1 April 1990 |
863 | + Ty Coon, President of Vice |
864 | + |
865 | +That's all there is to it! |
866 | + |
867 | |
868 | |
869 | === modified file 'ChangeLog' |
870 | --- ChangeLog 2007-11-26 06:09:08 +0000 |
871 | +++ ChangeLog 2010-07-22 15:29:47 +0000 |
872 | @@ -1,164 +1,174 @@ |
873 | -2007-02-20 01:00 mhoenicka |
874 | - |
875 | - * drivers/sqlite3/dbd_sqlite3.c (1.15): minor cleanup |
876 | - |
877 | -2007-02-20 00:57 mhoenicka |
878 | - |
879 | - * acinclude.m4 (1.21): removed trailing slash from dbi_incdirs |
880 | - |
881 | -2007-02-15 01:50 mhoenicka |
882 | - |
883 | - * drivers/: firebird/Makefile.am (1.5), freetds/Makefile.am (1.6), |
884 | - msql/Makefile.am (1.14), mysql/Makefile.am (1.17), |
885 | - oracle/Makefile.am (1.8), pgsql/Makefile.am (1.17), |
886 | - sqlite/Makefile.am (1.15), sqlite3/Makefile.am (1.8): added |
887 | - LIBADD_LIBDBI |
888 | - |
889 | -2007-02-15 01:49 mhoenicka |
890 | - |
891 | - * configure.in (1.35): bumped up version number; added |
892 | - --enable-libdbi and --with-dbi-libdir options |
893 | - |
894 | -2006-11-29 22:11 mhoenicka |
895 | - |
896 | - * drivers/mysql/dbd_mysql.c (1.90): dbd_get_encoding(): add support |
897 | - for MySQL 5.x |
898 | - |
899 | -2006-10-17 21:18 mhoenicka |
900 | - |
901 | - * drivers/: sqlite/dbd_sqlite.c (1.35), sqlite3/dbd_sqlite3.c |
902 | - (1.14): allow semicolons in query strings, see bug # 1577810 |
903 | - |
904 | -2006-10-17 21:01 mhoenicka |
905 | - |
906 | - * drivers/sqlite3/dbd_sqlite3.c (1.13): error message handling now |
907 | - uses the sqlite3 API call instead of the sqlite v. 2 workaround, |
908 | - see bug #1577808 |
909 | - |
910 | -2006-10-17 21:00 mhoenicka |
911 | - |
912 | - * drivers/sqlite/dbd_sqlite.c (1.34): fixed segfault due to error |
913 | - message workaround, see bug #1577808 |
914 | - |
915 | -2006-10-16 22:24 mhoenicka |
916 | - |
917 | - * tests/test_dbi.c (1.37): added test_error_messages() function |
918 | - |
919 | -2006-09-21 21:44 mhoenicka |
920 | - |
921 | - * drivers/pgsql/dbd_pgsql.c (1.51): Kjells patches for plugging a |
922 | - memory leak and for compatibility with older PostgreSQL versions |
923 | - |
924 | -2006-09-13 21:30 mhoenicka |
925 | - |
926 | - * configure.in (1.34), drivers/freetds/Makefile.am (1.5), |
927 | - drivers/msql/Makefile.am (1.13), drivers/mysql/Makefile.am |
928 | - (1.16), drivers/oracle/Makefile.am (1.7), |
929 | - drivers/pgsql/Makefile.am (1.16), drivers/sqlite/Makefile.am |
930 | - (1.14), drivers/sqlite3/Makefile.am (1.7): dont build docs if |
931 | - --disable-docs was used |
932 | - |
933 | -2006-08-29 21:49 mhoenicka |
934 | - |
935 | - * Makefile.am (1.8), configure.in (1.33): added --disable-docs |
936 | - switch |
937 | - |
938 | -2006-06-02 17:27 qu1j0t3 |
939 | - |
940 | - * tests/test_dbi.c (1.36): Add Ingres support to test_dbi.c |
941 | - |
942 | -2006-05-31 08:52 qu1j0t3 |
943 | - |
944 | - * AUTHORS (1.11), README (1.10), acinclude.m4 (1.20), configure.in |
945 | - (1.32), drivers/Makefile.am (1.8): Add Ingres 2006 (experimental) |
946 | - driver to libdbi-drivers build system. Driver has connect, query, |
947 | - fetch result functionality. Notable missing/incomplete features |
948 | - include handling of DATE, long blob, and UTF-16 column types; |
949 | - querying of system catalogs; querying of sequence values. |
950 | - |
951 | -2006-05-29 21:19 qu1j0t3 |
952 | - |
953 | - * drivers/pgsql/dbd_pgsql.c (1.50): use constant masks to isolate |
954 | - attributes; minor whitespace cleanup |
955 | - |
956 | -2006-05-29 21:16 qu1j0t3 |
957 | - |
958 | - * drivers/mysql/dbd_mysql.c (1.89): use constant masks to isolate |
959 | - attributes |
960 | - |
961 | -2006-05-16 08:27 mhoenicka |
962 | - |
963 | - * drivers/mysql/dbd_mysql.c (1.88): dbd_get_encoding(): use |
964 | - get_binary() instead of get_string() |
965 | - |
966 | -2006-05-15 23:07 mhoenicka |
967 | - |
968 | - * tests/test_dbi.c (1.35): added timezone tests |
969 | - |
970 | -2006-05-15 23:06 mhoenicka |
971 | - |
972 | - * drivers/pgsql/: dbd_pgsql.c (1.49), dbd_pgsql.h (1.4): fixed |
973 | - timezone column type handling |
974 | - |
975 | -2006-05-15 06:19 qu1j0t3 |
976 | - |
977 | - * drivers/mysql/dbd_mysql.c (1.87): add support for MySQL 5.0.3's |
978 | - BIT (unsigned 64 bit vector) and NEWDECIMAL (arbitrary precision |
979 | - decimal string) types |
980 | - |
981 | -2006-05-14 04:11 qu1j0t3 |
982 | - |
983 | - * drivers/mysql/: AUTHORS (1.2), README (1.2), dbd_mysql.c (1.86): |
984 | - Fix string/binary test for VAR_STRING, STRING and BLOB/TEXT |
985 | - types. Add some feature support clarifications to README. |
986 | - |
987 | -2006-05-14 04:01 qu1j0t3 |
988 | - |
989 | - * acinclude.m4 (1.19): improve formatting of --help option text |
990 | - |
991 | -2006-02-11 01:34 mhoenicka |
992 | - |
993 | - * drivers/: freetds/Makefile.am (1.4), msql/Makefile.am (1.12), |
994 | - mysql/Makefile.am (1.15), oracle/Makefile.am (1.6), |
995 | - pgsql/Makefile.am (1.15), sqlite/Makefile.am (1.13), |
996 | - sqlite3/Makefile.am (1.6): delete PDF by maintainer-clean |
997 | - |
998 | -2005-11-21 22:18 mhoenicka |
999 | - |
1000 | - * Makefile.w32 (1.8): renamed driver libraries |
1001 | - |
1002 | -2005-11-08 21:06 mhoenicka |
1003 | - |
1004 | - * drivers/oracle/: AUTHORS (1.4), dbd_oracle.c (1.20): Ashishs Nov |
1005 | - 8 patch kit |
1006 | - |
1007 | -2005-10-26 20:40 mhoenicka |
1008 | - |
1009 | - * doc/include/Makefile.am (1.1): initial version |
1010 | - |
1011 | -2005-10-26 20:40 mhoenicka |
1012 | - |
1013 | - * doc/Makefile.am (1.4): removed old doc junk; now passes only |
1014 | - through to include subdir |
1015 | - |
1016 | -2005-10-26 20:39 mhoenicka |
1017 | - |
1018 | - * Makefile.am (1.7), configure.in (1.31): added doc and doc/include |
1019 | - to the distributed files |
1020 | - |
1021 | -2005-09-28 21:55 mhoenicka |
1022 | - |
1023 | - * tests/test_dbi.c (1.34): added empty string and NULL string tests |
1024 | - |
1025 | -2005-09-27 20:42 mhoenicka |
1026 | - |
1027 | - * drivers/oracle/dbd_oracle.c (1.19): Ashish's return value fixes |
1028 | - |
1029 | -2005-09-25 23:56 mhoenicka |
1030 | - |
1031 | - * drivers/: firebird/Makefile.am (1.4), freetds/Makefile.am (1.3), |
1032 | - msql/Makefile.am (1.11), mysql/Makefile.am (1.14), |
1033 | - oracle/Makefile.am (1.5), pgsql/Makefile.am (1.14), |
1034 | - sqlite/Makefile.am (1.12), sqlite3/Makefile.am (1.5): changed |
1035 | - driver lib names from libname to libdbdname |
1036 | +2008-02-06 20:36 mhoenicka |
1037 | + |
1038 | + * NEWS, configure.in: updated for 0.8.3 |
1039 | + |
1040 | +2008-02-06 17:22 mhoenicka |
1041 | + |
1042 | + * tests/test_dbi.c: added tests for escape functions |
1043 | + |
1044 | +2008-01-26 18:39 mhoenicka |
1045 | + |
1046 | + * drivers/pgsql/dbd_pgsql.c: fixed pg_encoding_to_char() prototype |
1047 | + |
1048 | +2008-01-23 17:39 mhoenicka |
1049 | + |
1050 | + * tests/test_dbi.c: added dbi_result_get_binary_copy() test |
1051 | + |
1052 | +2008-01-15 15:11 mhoenicka |
1053 | + |
1054 | + * ChangeLog: final touches for 0.8.3-pre1 |
1055 | + |
1056 | +2008-01-15 15:07 mhoenicka |
1057 | + |
1058 | + * ChangeLog, NEWS, drivers/msql/dbd_msql.c, |
1059 | + drivers/sqlite/dbd_sqlite.c, drivers/sqlite3/dbd_sqlite3.c: final |
1060 | + touches for 0.8.3-pre1 |
1061 | + |
1062 | +2008-01-15 01:27 mhoenicka |
1063 | + |
1064 | + * drivers/firebird/dbd_firebird.c, drivers/firebird/utility.c, |
1065 | + drivers/msql/dbd_msql.c, drivers/mysql/dbd_mysql.c, |
1066 | + drivers/pgsql/dbd_pgsql.c, drivers/sqlite/dbd_sqlite.c, |
1067 | + drivers/sqlite3/dbd_sqlite3.c, tests/test_dbi.c: assorted fixes to |
1068 | + improve error handling and reporting |
1069 | + |
1070 | +2008-01-04 01:48 mhoenicka |
1071 | + |
1072 | + * drivers/sqlite3/dbd_sqlite3.c: retrieve field types using |
1073 | + table_info pragma |
1074 | + |
1075 | +2008-01-04 01:44 mhoenicka |
1076 | + |
1077 | + * tests/test_dbi.c: fixed time_tz bug |
1078 | + |
1079 | +2008-01-02 20:11 mhoenicka |
1080 | + |
1081 | + * drivers/firebird/utility.c: don't connect locally if localhost is |
1082 | + requested |
1083 | + |
1084 | +2008-01-02 20:09 mhoenicka |
1085 | + |
1086 | + * drivers/firebird/: Makefile.am, dbd_firebird.sgml: added driver |
1087 | + doc |
1088 | + |
1089 | +2008-01-02 17:26 mhoenicka |
1090 | + |
1091 | + * tests/test_dbi.c: added struct TABLEINFO to simplify data |
1092 | + retrieval;run tz conversion only if data are available |
1093 | + |
1094 | +2008-01-02 17:23 mhoenicka |
1095 | + |
1096 | + * drivers/firebird/utility.c: fixed buffer overflow in handling |
1097 | + variable-length strings |
1098 | + |
1099 | +2008-01-02 17:20 mhoenicka |
1100 | + |
1101 | + * drivers/firebird/dbd_firebird.c: fixed buffer overflow due to |
1102 | + fixed size result buffer;added error handling to queries |
1103 | + |
1104 | +2008-01-01 21:48 mhoenicka |
1105 | + |
1106 | + * tests/test_dbi.c: fixed local vs network access for firebird |
1107 | + |
1108 | +2008-01-01 21:46 mhoenicka |
1109 | + |
1110 | + * configure.in: removed --with-ltdl switch |
1111 | + |
1112 | +2008-01-01 01:18 mhoenicka |
1113 | + |
1114 | + * drivers/: firebird/dbd_firebird.c, freetds/dbd_freetds.c, |
1115 | + msql/dbd_msql.c, mysql/dbd_mysql.c, oracle/dbd_oracle.c, |
1116 | + pgsql/dbd_pgsql.c, sqlite/dbd_sqlite.c, sqlite3/dbd_sqlite3.c: |
1117 | + added safe_dlclose driver caps |
1118 | + |
1119 | +2008-01-01 01:16 mhoenicka |
1120 | + |
1121 | + * tests/test_dbi.c: fixed isql call |
1122 | + |
1123 | +2007-12-30 21:07 mhoenicka |
1124 | + |
1125 | + * Makefile.am, acinclude.m4, configure.in, |
1126 | + drivers/firebird/dbd_firebird.c, drivers/firebird/dbd_firebird.h, |
1127 | + drivers/firebird/utility.c, tests/Makefile.am, tests/test_dbi.c: |
1128 | + fixes for the firebird driver, firebird configuration, and test; |
1129 | + mostly working on Debian and FreeBSD, but with a few time/date |
1130 | + issues to be fixed |
1131 | + |
1132 | +2007-12-18 22:16 mhoenicka |
1133 | + |
1134 | + * drivers/oracle/dbd_oracle.c: applied Brechts patch for strptime |
1135 | + on mingw |
1136 | + |
1137 | +2007-12-18 21:50 mhoenicka |
1138 | + |
1139 | + * tests/test_dbi.c: added windows.h and sleep() definition for |
1140 | + mingw;fixed isql Debian hack for newer Debian releases |
1141 | + |
1142 | +2007-12-18 21:47 mhoenicka |
1143 | + |
1144 | + * drivers/firebird/utility.c: removed gds.h;use ISC_STATUS for |
1145 | + status vector; work around deprecated isc_expand_dpb;improved error |
1146 | + reporting |
1147 | + |
1148 | +2007-12-18 21:43 mhoenicka |
1149 | + |
1150 | + * drivers/firebird/dbd_firebird.c: removed gds.h; added FB_ALIGN |
1151 | + definition; changed TEXT to ISC_SCHAR |
1152 | + |
1153 | +2007-12-18 21:39 mhoenicka |
1154 | + |
1155 | + * Makefile.w32: added sqlite3 |
1156 | + |
1157 | +2007-12-11 22:49 mhoenicka |
1158 | + |
1159 | + * drivers/mysql/dbd_mysql.c: fixed encoding name bug in |
1160 | + dbd_connect() |
1161 | + |
1162 | +2007-12-08 23:48 mhoenicka |
1163 | + |
1164 | + * drivers/: mysql/dbd_mysql.sgml, sqlite/dbd_sqlite.sgml, |
1165 | + sqlite3/dbd_sqlite3.sgml: added GFDL blurb |
1166 | + |
1167 | +2007-12-07 01:30 mhoenicka |
1168 | + |
1169 | + * COPYING, README, drivers/sqlite/dbd_sqlite.c, |
1170 | + drivers/sqlite/dbd_sqlite.h, drivers/sqlite3/dbd_sqlite3.c, |
1171 | + drivers/sqlite3/dbd_sqlite3.h: changed license from GPL to LGPL |
1172 | + |
1173 | +2007-12-07 01:11 mhoenicka |
1174 | + |
1175 | + * configure.in: made linking drivers against libdbi the default, |
1176 | + can be turned off by --disable-libdbi; bumped up version number |
1177 | + |
1178 | +2007-11-06 22:01 mhoenicka |
1179 | + |
1180 | + * drivers/oracle/dbd_oracle.c: applied Bazsis's patch |
1181 | + |
1182 | +2007-07-16 22:24 mhoenicka |
1183 | + |
1184 | + * drivers/mysql/dbd_mysql.c: added conditional to include winsock.h |
1185 | + on MinGW |
1186 | + |
1187 | +2007-05-02 00:27 qu1j0t3 |
1188 | + |
1189 | + * ChangeLog, README.osx: remove dependence on Fink and simplify |
1190 | + recipe; add quickstart notes for MySQL and PostgreSQL. |
1191 | + |
1192 | +2007-03-27 19:59 mhoenicka |
1193 | + |
1194 | + * drivers/pgsql/dbd_pgsql.sgml: added pgsql_foo options |
1195 | + |
1196 | +2007-03-26 23:08 mhoenicka |
1197 | + |
1198 | + * drivers/pgsql/dbd_pgsql.c: Antal Novak's patch adding support for |
1199 | + all PostgreSQL connection options |
1200 | + |
1201 | +2007-03-13 22:27 mhoenicka |
1202 | + |
1203 | + * drivers/mysql/: dbd_mysql.c, dbd_mysql.sgml: support client flags |
1204 | + for mysql_real_connect() |
1205 | + |
1206 | +2007-02-22 10:01 mhoenicka |
1207 | + |
1208 | + * configure.in: bumped up version number to 0.8.2-1 |
1209 | |
1210 | |
1211 | === modified file 'Makefile.am' |
1212 | --- Makefile.am 2007-11-26 06:09:08 +0000 |
1213 | +++ Makefile.am 2010-07-22 15:29:47 +0000 |
1214 | @@ -4,7 +4,7 @@ |
1215 | |
1216 | SUBDIRS = drivers tests @docs_subdirs@ |
1217 | |
1218 | -EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README README.win32 README.osx TODO libdbi.spec.in config.h.in Makefile.w32 autogen.sh fixlt.sh |
1219 | +EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README README.win32 README.osx README.encodings TODO libdbi.spec.in config.h.in Makefile.w32 autogen.sh fixlt.sh |
1220 | |
1221 | debug: |
1222 | $(MAKE) all CFLAGS="@DEBUG@" |
1223 | |
1224 | === modified file 'Makefile.in' |
1225 | --- Makefile.in 2007-11-26 06:09:08 +0000 |
1226 | +++ Makefile.in 2010-07-22 15:29:47 +0000 |
1227 | @@ -1,8 +1,8 @@ |
1228 | -# Makefile.in generated by automake 1.10 from Makefile.am. |
1229 | +# Makefile.in generated by automake 1.9.6 from Makefile.am. |
1230 | # @configure_input@ |
1231 | |
1232 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
1233 | -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
1234 | +# 2003, 2004, 2005 Free Software Foundation, Inc. |
1235 | # This Makefile.in is free software; the Free Software Foundation |
1236 | # gives unlimited permission to copy and/or distribute it, |
1237 | # with or without modifications, as long as this notice is preserved. |
1238 | @@ -13,11 +13,15 @@ |
1239 | # PARTICULAR PURPOSE. |
1240 | |
1241 | @SET_MAKE@ |
1242 | +srcdir = @srcdir@ |
1243 | +top_srcdir = @top_srcdir@ |
1244 | VPATH = @srcdir@ |
1245 | pkgdatadir = $(datadir)/@PACKAGE@ |
1246 | pkglibdir = $(libdir)/@PACKAGE@ |
1247 | pkgincludedir = $(includedir)/@PACKAGE@ |
1248 | +top_builddir = . |
1249 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
1250 | +INSTALL = @INSTALL@ |
1251 | install_sh_DATA = $(install_sh) -c -m 644 |
1252 | install_sh_PROGRAM = $(install_sh) -c |
1253 | install_sh_SCRIPT = $(install_sh) -c |
1254 | @@ -31,19 +35,19 @@ |
1255 | POST_UNINSTALL = : |
1256 | build_triplet = @build@ |
1257 | host_triplet = @host@ |
1258 | -subdir = . |
1259 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
1260 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ |
1261 | $(srcdir)/libdbi.spec.in $(top_srcdir)/configure AUTHORS \ |
1262 | COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \ |
1263 | depcomp install-sh ltmain.sh missing |
1264 | +subdir = . |
1265 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
1266 | am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ |
1267 | $(top_srcdir)/configure.in |
1268 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1269 | $(ACLOCAL_M4) |
1270 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
1271 | - configure.lineno config.status.lineno |
1272 | + configure.lineno configure.status.lineno |
1273 | mkinstalldirs = $(install_sh) -d |
1274 | CONFIG_HEADER = config.h |
1275 | CONFIG_CLEAN_FILES = libdbi.spec |
1276 | @@ -51,13 +55,10 @@ |
1277 | DIST_SOURCES = |
1278 | RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
1279 | html-recursive info-recursive install-data-recursive \ |
1280 | - install-dvi-recursive install-exec-recursive \ |
1281 | - install-html-recursive install-info-recursive \ |
1282 | - install-pdf-recursive install-ps-recursive install-recursive \ |
1283 | - installcheck-recursive installdirs-recursive pdf-recursive \ |
1284 | - ps-recursive uninstall-recursive |
1285 | -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
1286 | - distclean-recursive maintainer-clean-recursive |
1287 | + install-exec-recursive install-info-recursive \ |
1288 | + install-recursive installcheck-recursive installdirs-recursive \ |
1289 | + pdf-recursive ps-recursive uninstall-info-recursive \ |
1290 | + uninstall-recursive |
1291 | ETAGS = etags |
1292 | CTAGS = ctags |
1293 | DIST_SUBDIRS = $(SUBDIRS) |
1294 | @@ -73,12 +74,17 @@ |
1295 | distuninstallcheck_listfiles = find . -type f -print |
1296 | distcleancheck_listfiles = find . -type f -print |
1297 | ACLOCAL = @ACLOCAL@ |
1298 | +AMDEP_FALSE = @AMDEP_FALSE@ |
1299 | +AMDEP_TRUE = @AMDEP_TRUE@ |
1300 | AMTAR = @AMTAR@ |
1301 | AR = @AR@ |
1302 | +AS = @AS@ |
1303 | AUTOCONF = @AUTOCONF@ |
1304 | AUTOHEADER = @AUTOHEADER@ |
1305 | AUTOMAKE = @AUTOMAKE@ |
1306 | AWK = @AWK@ |
1307 | +BUILDDOCS_FALSE = @BUILDDOCS_FALSE@ |
1308 | +BUILDDOCS_TRUE = @BUILDDOCS_TRUE@ |
1309 | CC = @CC@ |
1310 | CCDEPMODE = @CCDEPMODE@ |
1311 | CFLAGS = @CFLAGS@ |
1312 | @@ -93,6 +99,7 @@ |
1313 | DEBUG = @DEBUG@ |
1314 | DEFS = @DEFS@ |
1315 | DEPDIR = @DEPDIR@ |
1316 | +DLLTOOL = @DLLTOOL@ |
1317 | ECHO = @ECHO@ |
1318 | ECHO_C = @ECHO_C@ |
1319 | ECHO_N = @ECHO_N@ |
1320 | @@ -107,17 +114,34 @@ |
1321 | FREETDS_INCLUDE = @FREETDS_INCLUDE@ |
1322 | FREETDS_LDFLAGS = @FREETDS_LDFLAGS@ |
1323 | FREETDS_LIBS = @FREETDS_LIBS@ |
1324 | -GREP = @GREP@ |
1325 | +HAVE_DBI_FALSE = @HAVE_DBI_FALSE@ |
1326 | +HAVE_DBI_TRUE = @HAVE_DBI_TRUE@ |
1327 | +HAVE_FIREBIRD_INTERBASE_FALSE = @HAVE_FIREBIRD_INTERBASE_FALSE@ |
1328 | +HAVE_FIREBIRD_INTERBASE_TRUE = @HAVE_FIREBIRD_INTERBASE_TRUE@ |
1329 | +HAVE_FREETDS_FALSE = @HAVE_FREETDS_FALSE@ |
1330 | +HAVE_FREETDS_TRUE = @HAVE_FREETDS_TRUE@ |
1331 | +HAVE_INGRES_FALSE = @HAVE_INGRES_FALSE@ |
1332 | +HAVE_INGRES_TRUE = @HAVE_INGRES_TRUE@ |
1333 | +HAVE_MSQL_FALSE = @HAVE_MSQL_FALSE@ |
1334 | +HAVE_MSQL_TRUE = @HAVE_MSQL_TRUE@ |
1335 | +HAVE_MYSQL_FALSE = @HAVE_MYSQL_FALSE@ |
1336 | +HAVE_MYSQL_TRUE = @HAVE_MYSQL_TRUE@ |
1337 | +HAVE_ORACLE_FALSE = @HAVE_ORACLE_FALSE@ |
1338 | +HAVE_ORACLE_TRUE = @HAVE_ORACLE_TRUE@ |
1339 | +HAVE_PGSQL_FALSE = @HAVE_PGSQL_FALSE@ |
1340 | +HAVE_PGSQL_TRUE = @HAVE_PGSQL_TRUE@ |
1341 | +HAVE_SQLITE3_FALSE = @HAVE_SQLITE3_FALSE@ |
1342 | +HAVE_SQLITE3_TRUE = @HAVE_SQLITE3_TRUE@ |
1343 | +HAVE_SQLITE_FALSE = @HAVE_SQLITE_FALSE@ |
1344 | +HAVE_SQLITE_TRUE = @HAVE_SQLITE_TRUE@ |
1345 | INGRES_INCLUDE = @INGRES_INCLUDE@ |
1346 | INGRES_LDFLAGS = @INGRES_LDFLAGS@ |
1347 | INGRES_LIBS = @INGRES_LIBS@ |
1348 | -INSTALL = @INSTALL@ |
1349 | INSTALL_DATA = @INSTALL_DATA@ |
1350 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
1351 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
1352 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
1353 | LDFLAGS = @LDFLAGS@ |
1354 | -LIBADD_DL = @LIBADD_DL@ |
1355 | LIBADD_LIBDBI = @LIBADD_LIBDBI@ |
1356 | LIBOBJS = @LIBOBJS@ |
1357 | LIBS = @LIBS@ |
1358 | @@ -125,14 +149,16 @@ |
1359 | LN_S = @LN_S@ |
1360 | LTLIBOBJS = @LTLIBOBJS@ |
1361 | MAINT = @MAINT@ |
1362 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ |
1363 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ |
1364 | MAKEINFO = @MAKEINFO@ |
1365 | -MKDIR_P = @MKDIR_P@ |
1366 | MSQL_INCLUDE = @MSQL_INCLUDE@ |
1367 | MSQL_LDFLAGS = @MSQL_LDFLAGS@ |
1368 | MSQL_LIBS = @MSQL_LIBS@ |
1369 | MYSQL_INCLUDE = @MYSQL_INCLUDE@ |
1370 | MYSQL_LDFLAGS = @MYSQL_LDFLAGS@ |
1371 | MYSQL_LIBS = @MYSQL_LIBS@ |
1372 | +OBJDUMP = @OBJDUMP@ |
1373 | OBJEXT = @OBJEXT@ |
1374 | ORACLE_INCLUDE = @ORACLE_INCLUDE@ |
1375 | ORACLE_LDFLAGS = @ORACLE_LDFLAGS@ |
1376 | @@ -149,7 +175,6 @@ |
1377 | PGSQL_LIBS = @PGSQL_LIBS@ |
1378 | PROFILE = @PROFILE@ |
1379 | RANLIB = @RANLIB@ |
1380 | -SED = @SED@ |
1381 | SET_MAKE = @SET_MAKE@ |
1382 | SHELL = @SHELL@ |
1383 | SQLITE3_INCLUDE = @SQLITE3_INCLUDE@ |
1384 | @@ -160,13 +185,19 @@ |
1385 | SQLITE_LIBS = @SQLITE_LIBS@ |
1386 | STRIP = @STRIP@ |
1387 | VERSION = @VERSION@ |
1388 | -abs_builddir = @abs_builddir@ |
1389 | -abs_srcdir = @abs_srcdir@ |
1390 | -abs_top_builddir = @abs_top_builddir@ |
1391 | -abs_top_srcdir = @abs_top_srcdir@ |
1392 | +ac_ct_AR = @ac_ct_AR@ |
1393 | +ac_ct_AS = @ac_ct_AS@ |
1394 | ac_ct_CC = @ac_ct_CC@ |
1395 | ac_ct_CXX = @ac_ct_CXX@ |
1396 | +ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ |
1397 | ac_ct_F77 = @ac_ct_F77@ |
1398 | +ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ |
1399 | +ac_ct_RANLIB = @ac_ct_RANLIB@ |
1400 | +ac_ct_STRIP = @ac_ct_STRIP@ |
1401 | +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ |
1402 | +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ |
1403 | +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ |
1404 | +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ |
1405 | am__include = @am__include@ |
1406 | am__leading_dot = @am__leading_dot@ |
1407 | am__quote = @am__quote@ |
1408 | @@ -178,44 +209,33 @@ |
1409 | build_cpu = @build_cpu@ |
1410 | build_os = @build_os@ |
1411 | build_vendor = @build_vendor@ |
1412 | -builddir = @builddir@ |
1413 | datadir = @datadir@ |
1414 | -datarootdir = @datarootdir@ |
1415 | -docdir = @docdir@ |
1416 | docs_subdirs = @docs_subdirs@ |
1417 | driverdir = @driverdir@ |
1418 | -dvidir = @dvidir@ |
1419 | exec_prefix = @exec_prefix@ |
1420 | host = @host@ |
1421 | host_alias = @host_alias@ |
1422 | host_cpu = @host_cpu@ |
1423 | host_os = @host_os@ |
1424 | host_vendor = @host_vendor@ |
1425 | -htmldir = @htmldir@ |
1426 | includedir = @includedir@ |
1427 | infodir = @infodir@ |
1428 | install_sh = @install_sh@ |
1429 | libdir = @libdir@ |
1430 | libexecdir = @libexecdir@ |
1431 | -localedir = @localedir@ |
1432 | localstatedir = @localstatedir@ |
1433 | mandir = @mandir@ |
1434 | mkdir_p = @mkdir_p@ |
1435 | oldincludedir = @oldincludedir@ |
1436 | -pdfdir = @pdfdir@ |
1437 | prefix = @prefix@ |
1438 | program_transform_name = @program_transform_name@ |
1439 | -psdir = @psdir@ |
1440 | sbindir = @sbindir@ |
1441 | sharedstatedir = @sharedstatedir@ |
1442 | -srcdir = @srcdir@ |
1443 | sysconfdir = @sysconfdir@ |
1444 | target_alias = @target_alias@ |
1445 | -top_builddir = @top_builddir@ |
1446 | -top_srcdir = @top_srcdir@ |
1447 | AUTOMAKE_OPTIONS = foreign dist-zip |
1448 | SUBDIRS = drivers tests @docs_subdirs@ |
1449 | -EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README README.win32 README.osx TODO libdbi.spec.in config.h.in Makefile.w32 autogen.sh fixlt.sh |
1450 | +EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README README.win32 README.osx README.encodings TODO libdbi.spec.in config.h.in Makefile.w32 autogen.sh fixlt.sh |
1451 | all: config.h |
1452 | $(MAKE) $(AM_MAKEFLAGS) all-recursive |
1453 | |
1454 | @@ -257,7 +277,7 @@ |
1455 | config.h: stamp-h1 |
1456 | @if test ! -f $@; then \ |
1457 | rm -f stamp-h1; \ |
1458 | - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ |
1459 | + $(MAKE) stamp-h1; \ |
1460 | else :; fi |
1461 | |
1462 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status |
1463 | @@ -281,6 +301,7 @@ |
1464 | |
1465 | distclean-libtool: |
1466 | -rm -f libtool |
1467 | +uninstall-info-am: |
1468 | |
1469 | # This directory's subdirectories are mostly independent; you can cd |
1470 | # into them and run `make' without going through this Makefile. |
1471 | @@ -313,7 +334,8 @@ |
1472 | $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ |
1473 | fi; test -z "$$fail" |
1474 | |
1475 | -$(RECURSIVE_CLEAN_TARGETS): |
1476 | +mostlyclean-recursive clean-recursive distclean-recursive \ |
1477 | +maintainer-clean-recursive: |
1478 | @failcom='exit 1'; \ |
1479 | for f in x $$MAKEFLAGS; do \ |
1480 | case $$f in \ |
1481 | @@ -415,22 +437,24 @@ |
1482 | |
1483 | distdir: $(DISTFILES) |
1484 | $(am__remove_distdir) |
1485 | - test -d $(distdir) || mkdir $(distdir) |
1486 | - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
1487 | - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
1488 | - list='$(DISTFILES)'; \ |
1489 | - dist_files=`for file in $$list; do echo $$file; done | \ |
1490 | - sed -e "s|^$$srcdirstrip/||;t" \ |
1491 | - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ |
1492 | - case $$dist_files in \ |
1493 | - */*) $(MKDIR_P) `echo "$$dist_files" | \ |
1494 | - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ |
1495 | - sort -u` ;; \ |
1496 | - esac; \ |
1497 | - for file in $$dist_files; do \ |
1498 | + mkdir $(distdir) |
1499 | + $(mkdir_p) $(distdir)/. |
1500 | + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ |
1501 | + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ |
1502 | + list='$(DISTFILES)'; for file in $$list; do \ |
1503 | + case $$file in \ |
1504 | + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ |
1505 | + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ |
1506 | + esac; \ |
1507 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ |
1508 | + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ |
1509 | + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ |
1510 | + dir="/$$dir"; \ |
1511 | + $(mkdir_p) "$(distdir)$$dir"; \ |
1512 | + else \ |
1513 | + dir=''; \ |
1514 | + fi; \ |
1515 | if test -d $$d/$$file; then \ |
1516 | - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ |
1517 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ |
1518 | cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ |
1519 | fi; \ |
1520 | @@ -444,7 +468,7 @@ |
1521 | list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
1522 | if test "$$subdir" = .; then :; else \ |
1523 | test -d "$(distdir)/$$subdir" \ |
1524 | - || $(MKDIR_P) "$(distdir)/$$subdir" \ |
1525 | + || $(mkdir_p) "$(distdir)/$$subdir" \ |
1526 | || exit 1; \ |
1527 | distdir=`$(am__cd) $(distdir) && pwd`; \ |
1528 | top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ |
1529 | @@ -452,8 +476,6 @@ |
1530 | $(MAKE) $(AM_MAKEFLAGS) \ |
1531 | top_distdir="$$top_distdir" \ |
1532 | distdir="$$distdir/$$subdir" \ |
1533 | - am__remove_distdir=: \ |
1534 | - am__skip_length_check=: \ |
1535 | distdir) \ |
1536 | || exit 1; \ |
1537 | fi; \ |
1538 | @@ -461,7 +483,7 @@ |
1539 | -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ |
1540 | ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ |
1541 | ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ |
1542 | - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ |
1543 | + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ |
1544 | || chmod -R a+r $(distdir) |
1545 | dist-gzip: distdir |
1546 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
1547 | @@ -537,7 +559,7 @@ |
1548 | $(am__remove_distdir) |
1549 | @(echo "$(distdir) archives ready for distribution: "; \ |
1550 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
1551 | - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
1552 | + sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' |
1553 | distuninstallcheck: |
1554 | @cd $(distuninstallcheck_dir) \ |
1555 | && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ |
1556 | @@ -607,20 +629,12 @@ |
1557 | |
1558 | install-data-am: |
1559 | |
1560 | -install-dvi: install-dvi-recursive |
1561 | - |
1562 | install-exec-am: |
1563 | |
1564 | -install-html: install-html-recursive |
1565 | - |
1566 | install-info: install-info-recursive |
1567 | |
1568 | install-man: |
1569 | |
1570 | -install-pdf: install-pdf-recursive |
1571 | - |
1572 | -install-ps: install-ps-recursive |
1573 | - |
1574 | installcheck-am: |
1575 | |
1576 | maintainer-clean: maintainer-clean-recursive |
1577 | @@ -641,26 +655,24 @@ |
1578 | |
1579 | ps-am: |
1580 | |
1581 | -uninstall-am: |
1582 | - |
1583 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ |
1584 | - install-strip |
1585 | - |
1586 | -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
1587 | - all all-am am--refresh check check-am clean clean-generic \ |
1588 | - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ |
1589 | - dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ |
1590 | +uninstall-am: uninstall-info-am |
1591 | + |
1592 | +uninstall-info: uninstall-info-recursive |
1593 | + |
1594 | +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ |
1595 | + check-am clean clean-generic clean-libtool clean-recursive \ |
1596 | + ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ |
1597 | + dist-shar dist-tarZ dist-zip distcheck distclean \ |
1598 | distclean-generic distclean-hdr distclean-libtool \ |
1599 | - distclean-tags distcleancheck distdir distuninstallcheck dvi \ |
1600 | - dvi-am html html-am info info-am install install-am \ |
1601 | - install-data install-data-am install-dvi install-dvi-am \ |
1602 | - install-exec install-exec-am install-html install-html-am \ |
1603 | - install-info install-info-am install-man install-pdf \ |
1604 | - install-pdf-am install-ps install-ps-am install-strip \ |
1605 | - installcheck installcheck-am installdirs installdirs-am \ |
1606 | - maintainer-clean maintainer-clean-generic mostlyclean \ |
1607 | - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
1608 | - tags tags-recursive uninstall uninstall-am |
1609 | + distclean-recursive distclean-tags distcleancheck distdir \ |
1610 | + distuninstallcheck dvi dvi-am html html-am info info-am \ |
1611 | + install install-am install-data install-data-am install-exec \ |
1612 | + install-exec-am install-info install-info-am install-man \ |
1613 | + install-strip installcheck installcheck-am installdirs \ |
1614 | + installdirs-am maintainer-clean maintainer-clean-generic \ |
1615 | + maintainer-clean-recursive mostlyclean mostlyclean-generic \ |
1616 | + mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ |
1617 | + tags tags-recursive uninstall uninstall-am uninstall-info-am |
1618 | |
1619 | |
1620 | debug: |
1621 | |
1622 | === modified file 'Makefile.w32' |
1623 | --- Makefile.w32 2007-11-26 06:09:08 +0000 |
1624 | +++ Makefile.w32 2010-07-22 15:29:47 +0000 |
1625 | @@ -37,21 +37,24 @@ |
1626 | DEBUG = -g -Wall -D__NO_MATH_INLINES -fsigned-char |
1627 | MSQL_LIBS = -L /usr/local/lib -L /usr/local/msql3/lib -ldbi -lmsql -liberty -lz |
1628 | MYSQL_LIBS = -L /usr/local/lib -ldbi -lmysqlclient -liberty -lz |
1629 | -PGSQL_LIBS = -L /usr/local/lib -ldbi -ldbi -lpq -liberty |
1630 | -SQLITE_LIBS = -L /usr/local/lib -ldbi -ldbi -lsqlite -liberty |
1631 | +PGSQL_LIBS = -L /usr/local/lib -ldbi -lpq -liberty |
1632 | +SQLITE_LIBS = -L /usr/local/lib -ldbi -lsqlite -liberty |
1633 | +SQLITE3_LIBS = -L /usr/local/lib -ldbi -lsqlite3 -liberty |
1634 | driverdir = ${exec_prefix}/lib/dbd |
1635 | |
1636 | LIBMSQL_DLL_NAME = libdbdmsql.dll |
1637 | LIBMYSQL_DLL_NAME = libdbdmysql.dll |
1638 | LIBPGSQL_DLL_NAME = libdbdpgsql.dll |
1639 | LIBSQLITE_DLL_NAME = libdbdsqlite.dll |
1640 | +LIBSQLITE3_DLL_NAME = libdbdsqlite3.dll |
1641 | |
1642 | LIBMSQL_DLL_EXP_LIB = libdbdmsql.dll.a |
1643 | LIBMYSQL_DLL_EXP_LIB = libdbdmysql.dll.a |
1644 | LIBPGSQL_DLL_EXP_LIB = libdbdpgsql.dll.a |
1645 | LIBSQLITE_DLL_EXP_LIB = libdbdsqlite.dll.a |
1646 | +LIBSQLITE3_DLL_EXP_LIB = libdbdsqlite3.dll.a |
1647 | |
1648 | -all: libmysql-dll libpgsql-dll libsqlite-dll libmsql-dll |
1649 | +all: libmysql-dll libpgsql-dll libsqlite-dll libsqlite3-dll libmsql-dll |
1650 | |
1651 | libmsql-dll: $(top_srcdir)/drivers/msql/dbd_msql.o |
1652 | $(CC) -shared -Wl,--out-implib=$(top_srcdir)/drivers/msql/.libs/$(LIBMSQL_DLL_EXP_LIB) -o $(top_srcdir)/drivers/msql/.libs/$(LIBMSQL_DLL_NAME) -L$(top_srcdir)/src/.libs $(LDFLAGS) $(top_srcdir)/drivers/msql/*.o $(MSQL_LIBS) |
1653 | @@ -65,7 +68,10 @@ |
1654 | libsqlite-dll: $(top_srcdir)/drivers/sqlite/dbd_sqlite.o |
1655 | $(CC) -shared -Wl,--out-implib=$(top_srcdir)/drivers/sqlite/.libs/$(LIBSQLITE_DLL_EXP_LIB) -o $(top_srcdir)/drivers/sqlite/.libs/$(LIBSQLITE_DLL_NAME) $(LDFLAGS) $(top_srcdir)/drivers/sqlite/*.o $(SQLITE_LIBS) |
1656 | |
1657 | -install: install-libmysql install-libpgsql install-libsqlite install-libmsql |
1658 | +libsqlite3-dll: $(top_srcdir)/drivers/sqlite3/dbd_sqlite3.o |
1659 | + $(CC) -shared -Wl,--out-implib=$(top_srcdir)/drivers/sqlite3/.libs/$(LIBSQLITE3_DLL_EXP_LIB) -o $(top_srcdir)/drivers/sqlite3/.libs/$(LIBSQLITE3_DLL_NAME) $(LDFLAGS) $(top_srcdir)/drivers/sqlite3/*.o $(SQLITE3_LIBS) |
1660 | + |
1661 | +install: install-libmysql install-libpgsql install-libsqlite install-libsqlite3 install-libmsql |
1662 | |
1663 | install-libmsql: |
1664 | cp $(top_srcdir)/drivers/msql/.libs/$(LIBMSQL_DLL_NAME) $(driverdir) && \ |
1665 | @@ -83,8 +89,13 @@ |
1666 | cp $(top_srcdir)/drivers/sqlite/.libs/$(LIBSQLITE_DLL_NAME) $(driverdir) && \ |
1667 | cp $(top_srcdir)/drivers/sqlite/.libs/$(LIBSQLITE_DLL_EXP_LIB) $(driverdir) |
1668 | |
1669 | - |
1670 | -.PHONY: libdbdmysql.dll libdbdpgsql.dll libdbdsqlite.dll libdbdmsql.dll install install-libmysql install-libpgsql install-libsqlite |
1671 | +install-libsqlite3: |
1672 | + cp $(top_srcdir)/drivers/sqlite3/.libs/$(LIBSQLITE3_DLL_NAME) $(driverdir) && \ |
1673 | + cp $(top_srcdir)/drivers/sqlite3/.libs/$(LIBSQLITE3_DLL_EXP_LIB) $(driverdir) |
1674 | + |
1675 | + |
1676 | + |
1677 | +.PHONY: libdbdmysql.dll libdbdpgsql.dll libdbdsqlite.dll libdbdsqlite3.dll libdbdmsql.dll install install-libmysql install-libpgsql install-libsqlite install-libsqlite3 |
1678 | |
1679 | |
1680 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
1681 | |
1682 | === modified file 'NEWS' |
1683 | --- NEWS 2007-11-26 06:09:08 +0000 |
1684 | +++ NEWS 2010-07-22 15:29:47 +0000 |
1685 | @@ -1,6 +1,30 @@ |
1686 | libdbi-drivers NEWS file |
1687 | ======================== |
1688 | |
1689 | +__________________________________________ |
1690 | +0.8.3 (the "Shores of California" release) |
1691 | + |
1692 | +- major overhaul of the firebird driver. The driver is now linked to |
1693 | + libfbembed.so instead of libfbclient.so. You can request a local |
1694 | + connection (bypassing the server altogether) by using an empty |
1695 | + hostname, or a local connection through the server by using |
1696 | + "localhost" or the actual computer name as the hostname. |
1697 | + |
1698 | +- changed all driver code to LGPL, and all doc code to GFDL with no |
1699 | + invariant sections as requested by several packagers |
1700 | + |
1701 | +- made linking drivers against libdbi the default. This behaviour can be |
1702 | + switched off by --disable-libdbi, a reversal of the previous default |
1703 | + |
1704 | +- improved support for MySQL and PostgreSQL connection options |
1705 | + |
1706 | +- assorted fixes for MinGW compatibility |
1707 | + |
1708 | +- all drivers now implement the "safe_dlclose" driver capability to |
1709 | + signal libdbi whether or not the driver can safely be unloaded from |
1710 | + memory. |
1711 | + |
1712 | + |
1713 | _____________________________________ |
1714 | 0.8.2 (the "Payday in a Pub" release) |
1715 | |
1716 | @@ -13,16 +37,25 @@ |
1717 | Remember that this change affects only the library names. The driver |
1718 | names (the ones your program uses to load particular drivers) did |
1719 | *not* change |
1720 | + |
1721 | - assorted fixes in the oracle driver |
1722 | + |
1723 | - the mysql driver now supports the BIT and NEWDECIMAL types |
1724 | introduced in MySQL 5.0.3 |
1725 | + |
1726 | - added a new (experimental) Ingres 2006 driver |
1727 | + |
1728 | - the "--disable-docs" configure switch now allows to build |
1729 | libdbi-drivers without having the sgml toolchain installed |
1730 | + |
1731 | - plugged a few memory holes |
1732 | + |
1733 | - fixed a segfault in the error message handling code of sqlite/sqlite3 |
1734 | + |
1735 | - improved compatibility with older PostgreSQL versions |
1736 | + |
1737 | - sqlite and sqlite3 now grok semicolons in query strings |
1738 | + |
1739 | - you can now optionally link the drivers against libdbi by using the |
1740 | "--enable-libdbi" configure switch. This sounds weird at first, but it |
1741 | allows to load libdbi into a dlopen'ed module, like this: |
1742 | @@ -77,4 +110,4 @@ |
1743 | - sqlite driver now attempts to support all MySQL and PosgreSQL data |
1744 | types |
1745 | |
1746 | -$Id: NEWS,v 1.4 2007/02/20 00:56:13 mhoenicka Exp $ |
1747 | \ No newline at end of file |
1748 | +$Id: NEWS,v 1.6 2008/02/06 19:36:41 mhoenicka Exp $ |
1749 | \ No newline at end of file |
1750 | |
1751 | === modified file 'README' |
1752 | --- README 2007-11-26 06:09:08 +0000 |
1753 | +++ README 2010-07-22 15:29:47 +0000 |
1754 | @@ -1,7 +1,7 @@ |
1755 | |
1756 | libdbi-drivers - drivers for libdbi, a database abstraction |
1757 | layer implemented in C |
1758 | -Copyright (C) 2001-2004, Markus Hoenicka |
1759 | +Copyright (C) 2001-2007, Markus Hoenicka |
1760 | http://libdbi-drivers.sourceforge.net |
1761 | |
1762 | |
1763 | @@ -67,11 +67,12 @@ |
1764 | mailing list! (see below) |
1765 | |
1766 | |
1767 | -MODIFICATIONS AND REDISTRIBUTION (GPL): |
1768 | +MODIFICATIONS AND REDISTRIBUTION (LGPL): |
1769 | ---------------------------------------- |
1770 | |
1771 | -See the GNU General Public License, available in the distribution file |
1772 | -COPYING or visit http://www.gnu.org for more details. |
1773 | +See the GNU Lesser General Public License, available in the |
1774 | +distribution file COPYING or visit http://www.gnu.org for more |
1775 | +details. |
1776 | |
1777 | |
1778 | DOCUMENTATION: |
1779 | @@ -94,5 +95,5 @@ |
1780 | http://libdbi-drivers.sourceforge.net |
1781 | Markus Hoenicka <mhoenicka@users.sourceforge.net> |
1782 | David Parker <david@neongoat.com> |
1783 | -$Id: README,v 1.10 2006/05/31 06:52:33 qu1j0t3 Exp $ |
1784 | +$Id: README,v 1.11 2007/12/07 00:30:41 mhoenicka Exp $ |
1785 | |
1786 | |
1787 | === added file 'README.encodings' |
1788 | --- README.encodings 1970-01-01 00:00:00 +0000 |
1789 | +++ README.encodings 2010-07-22 15:29:47 +0000 |
1790 | @@ -0,0 +1,71 @@ |
1791 | +Translation table for character encodings |
1792 | +The first column is what dbi_get_conn_encoding() returns. This is the preferred MIME |
1793 | +name, if available, otherwise another official name |
1794 | +Source for preferred MIME names and other official names: |
1795 | +http://www.iana.org/assignments/character-sets |
1796 | + |
1797 | +$Id: README.encodings,v 1.2 2004/01/10 19:52:45 bhazer Exp $ |
1798 | + |
1799 | +MIME pgsql mysql sqlite oracle msql |
1800 | +US-ASCII SQL_ASCII ascii US7ASCII |
1801 | +EUC-JP EUC_JP ujis JA16EUC,JA16EUCYEN |
1802 | + EUC_CN |
1803 | +EUC-KR EUC_KR euc_kr |
1804 | +EUC-KR euckr |
1805 | + EUC_TW |
1806 | +UTF-8 UNICODE utf8 UTF-8 UTF8 |
1807 | +UTF-16 |
1808 | + MULE_INTERNAL |
1809 | +ISO-8859-1 LATIN1 latin1 iso8859 |
1810 | +ISO-8859-2 LATIN2 latin2 WE8ISO8859P9 |
1811 | +ISO-8859-3 LATIN3 |
1812 | +ISO-8859-4 LATIN4 |
1813 | +ISO-8859-9 LATIN5 latin5 |
1814 | +ISO-8859-10 LATIN6 |
1815 | +ISO-8859-13 LATIN7 latin7 |
1816 | +ISO-8859-14 LATIN8 |
1817 | +ISO-8859-15 LATIN9 |
1818 | +ISO-8859-16 LATIN10 |
1819 | +ISO-8859-5 ISO-8859-5 |
1820 | +ISO-8859-6 ISO-8859-6 AR8ISO8859P6 |
1821 | +ISO-8859-7 ISO-8859-7 greek |
1822 | +ISO-8859-8 ISO-8859-8 hebrew IW8ISO8859P8 |
1823 | +KOI8-R KOI8 koi8_ru |
1824 | +KOI8-R koi8r |
1825 | +KOI8-U koi8_ukr |
1826 | +KOI8-U koi8u |
1827 | +windows-1251 WIN cp1251 |
1828 | +IBM866 ALT |
1829 | +windows-1250 win1250 |
1830 | +windows-1250 cp1250 |
1831 | +windows-1256 cp1256 |
1832 | +windows-1257 win1257 |
1833 | +windows-1257 cp1257 |
1834 | +IBM850 cp850 |
1835 | +IBM852 cp852 |
1836 | +IBM857 TR8PC857 |
1837 | +IBM865 dos |
1838 | +IBM866 cp866 |
1839 | +Big5 big5 |
1840 | +GB2312 gb2312 |
1841 | +Shift_JIS sjis |
1842 | +ISO646-NO danish |
1843 | +ISO646-HU hungarian |
1844 | +GBK gbk |
1845 | +ISO-10646-UCS-2 ucs2 |
1846 | +DEC-MCS dec8 |
1847 | +TIS-620 tis620 |
1848 | +hp-roman8 hp8 |
1849 | + czech |
1850 | + german1 |
1851 | + swe7 |
1852 | + usa7 |
1853 | + estonia |
1854 | + win1251ukr |
1855 | + croat |
1856 | + armscii8 |
1857 | + keybcs2 |
1858 | + macce |
1859 | + macroman |
1860 | + binary |
1861 | + geostd8 |
1862 | |
1863 | === modified file 'README.osx' |
1864 | --- README.osx 2004-02-01 14:33:06 +0000 |
1865 | +++ README.osx 2010-07-22 15:29:47 +0000 |
1866 | @@ -6,34 +6,57 @@ |
1867 | http://libdbi-drivers.sourceforge.net |
1868 | |
1869 | |
1870 | -OSX-SPECIFIC INSTALLATION INSTRUCTIONS: |
1871 | -------------------------------------------- |
1872 | - |
1873 | -Installing libdbi-drivers on OSX can be easily accomplished by bending |
1874 | -over backwards while jumping through a burning hoop. This is the |
1875 | -recommended procedure to achieve this feat: |
1876 | - |
1877 | -/sw/bin/glibtoolize --force |
1878 | -aclocal |
1879 | -automake --add-missing |
1880 | -autoconf |
1881 | -./configure --with-mysql --with-pgsql --with-sqlite --with-pgsql-dir=/opt/local/pgsql LDFLAGS="-L/sw/lib" |
1882 | -./fixlt.sh |
1883 | -make |
1884 | -sudo make install |
1885 | - |
1886 | -The fixlt.sh script is shipped with libdbi-drivers. It is required to |
1887 | -fix the libtool script created by configure for libtool versions |
1888 | -1.4.x. libtool versions 1.5.x should not require this hack. |
1889 | - |
1890 | -Please note that you may have to adapt some paths depending on where |
1891 | -your stuff is installed. |
1892 | +OS X-SPECIFIC INSTALLATION INSTRUCTIONS: |
1893 | +---------------------------------------- |
1894 | + |
1895 | +(Tested on 10.4.9/PowerPC) |
1896 | + |
1897 | + LIBTOOLIZE=glibtoolize ./autogen.sh |
1898 | + ./configure --disable-docs --with-mysql --with-pgsql --with-sqlite --with-pgsql-dir=/opt/local/pgsql LDFLAGS="-L/sw/lib" |
1899 | + make |
1900 | + sudo make install |
1901 | + |
1902 | +Adjust configure options and paths according to which databases you are |
1903 | +using, and where their headers and libraries are installed. |
1904 | + |
1905 | + |
1906 | +QUICKSTART - MYSQL |
1907 | +------------------ |
1908 | +If you are using the MySQL.com Community[1] or Enterprise[2] package, |
1909 | +or a source install in the default location: |
1910 | + |
1911 | + sudo ln -s /usr/local/mysql/include /usr/include/mysql |
1912 | + ./configure --with-mysql --with-mysql-dir=/usr/local/mysql --disable-docs |
1913 | + make |
1914 | + sudo make install |
1915 | + |
1916 | +[1] http://dev.mysql.com/downloads/ |
1917 | +[2] https://enterprise.mysql.com/software/enterprise.php |
1918 | + |
1919 | + |
1920 | +QUICKSTART - POSTGRESQL |
1921 | +----------------------- |
1922 | +There are several options for installing PostgreSQL on OS X, including: |
1923 | +- Marc Liyanage's package at http://www.entropy.ch/software/macosx/postgresql/ |
1924 | +- Druware's package at http://postgresqlformac.com/ |
1925 | +- Fink package manager, see http://developer.apple.com/internet/opensource/postgres.html |
1926 | + |
1927 | +If using the entropy.ch package, configure libdbi-drivers as follows: |
1928 | + ./configure --with-pgsql --with-pgsql-dir=/usr/local/pgsql --disable-docs |
1929 | + |
1930 | +If using the postgresqlformac.com package, |
1931 | + ./configure --with-pgsql --with-pgsql-dir=/Library/PostgreSQL8 --disable-docs |
1932 | + |
1933 | +In all cases, build and install libdbi-drivers as follows: |
1934 | + make |
1935 | + sudo make install |
1936 | + |
1937 | |
1938 | MODIFICATIONS AND REDISTRIBUTION (GPL): |
1939 | ----------------------------------------- |
1940 | +--------------------------------------- |
1941 | |
1942 | See the file COPYING or http://www.gnu.org for more details. |
1943 | |
1944 | |
1945 | -$Id: README.osx,v 1.1 2003/06/09 20:04:54 mhoenicka Exp $ |
1946 | +$Id: README.osx,v 1.2 2007/05/01 22:27:28 qu1j0t3 Exp $ |
1947 | |
1948 | |
1949 | === modified file 'acinclude.m4' |
1950 | --- acinclude.m4 2007-11-26 06:09:08 +0000 |
1951 | +++ acinclude.m4 2010-07-22 15:29:47 +0000 |
1952 | @@ -450,7 +450,8 @@ |
1953 | firebird_incdirs="/opt/firebird/include /usr/include /usr/local/include /usr/include/firebird /usr/local/include/firebird /usr/local/firebird/include /opt/firebird/include" |
1954 | AC_FIND_FILE(ibase.h, $firebird_incdirs, ac_firebird_incdir) |
1955 | firebird_libdirs="/opt/firebird/lib /usr/lib /usr/local/lib /usr/lib/firebird /usr/local/lib/firebird /usr/local/firebird/lib /opt/firebird/lib" |
1956 | - AC_FIND_FILE(libfbclient.so, $firebird_libdirs, ac_firebird_libdir) |
1957 | +dnl AC_FIND_FILE(libfbclient.so, $firebird_libdirs, ac_firebird_libdir) |
1958 | + AC_FIND_FILE(libfbembed.so, $firebird_libdirs, ac_firebird_libdir) |
1959 | if test "$ac_firebird_incdir" = "no"; then |
1960 | AC_MSG_RESULT(no) |
1961 | AC_MSG_ERROR([Invalid Firebird/Interbase directory - include files not found.]) |
1962 | @@ -465,10 +466,23 @@ |
1963 | |
1964 | dnl libfbclient needs pthreads |
1965 | AC_SEARCH_LIBS(pthread_create, c_r pthread,,) |
1966 | - |
1967 | - FIREBIRD_LIBS="-lfbclient" |
1968 | + CFLAGS="$CFLAGS -I$ac_firebird_incdir" |
1969 | + |
1970 | + dnl firebird versions prior to 2.0 do not define ISC_SCHAR |
1971 | + AC_MSG_CHECKING(for ISC_SCHAR type definition) |
1972 | + AC_COMPILE_IFELSE(AC_LANG_PROGRAM( |
1973 | + [[#include <ibase.h>]], |
1974 | + [[ISC_SCHAR c;]]), |
1975 | + |
1976 | + [AC_DEFINE([HAVE_ISC_SCHAR], ["1"], [Define to 1 if ibase.h defines ISC_SCHAR]) |
1977 | + SCHAR_MSG="yes"], |
1978 | + [SCHAR_MSG="no"]) |
1979 | + AC_MSG_RESULT([$SCHAR_MSG]) |
1980 | + |
1981 | +dnl FIREBIRD_LIBS="-lfbclient" |
1982 | + FIREBIRD_LIBS="-lfbembed" |
1983 | FIREBIRD_INCLUDE="-I$ac_firebird_incdir" |
1984 | - FIREBIRD_LDFLAGS=-L$ac_firebird_libdir |
1985 | + FIREBIRD_LDFLAGS="-L$ac_firebird_libdir" |
1986 | |
1987 | AC_SUBST(FIREBIRD_LIBS) |
1988 | AC_SUBST(FIREBIRD_INCLUDE) |
1989 | |
1990 | === modified file 'aclocal.m4' |
1991 | --- aclocal.m4 2007-11-26 06:09:08 +0000 |
1992 | +++ aclocal.m4 2010-07-22 15:29:47 +0000 |
1993 | @@ -1,7 +1,7 @@ |
1994 | -# generated automatically by aclocal 1.10 -*- Autoconf -*- |
1995 | +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- |
1996 | |
1997 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
1998 | -# 2005, 2006 Free Software Foundation, Inc. |
1999 | +# 2005 Free Software Foundation, Inc. |
2000 | # This file is free software; the Free Software Foundation |
2001 | # gives unlimited permission to copy and/or distribute it, |
2002 | # with or without modifications, as long as this notice is preserved. |
2003 | @@ -11,14 +11,499 @@ |
2004 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
2005 | # PARTICULAR PURPOSE. |
2006 | |
2007 | -m4_if(m4_PACKAGE_VERSION, [2.61],, |
2008 | -[m4_fatal([this file was generated for autoconf 2.61. |
2009 | -You have another version of autoconf. If you want to use that, |
2010 | -you should regenerate the build system entirely.], [63])]) |
2011 | +# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. |
2012 | +# |
2013 | +# This file is free software; the Free Software Foundation |
2014 | +# gives unlimited permission to copy and/or distribute it, |
2015 | +# with or without modifications, as long as this notice is preserved. |
2016 | + |
2017 | +# AM_AUTOMAKE_VERSION(VERSION) |
2018 | +# ---------------------------- |
2019 | +# Automake X.Y traces this macro to ensure aclocal.m4 has been |
2020 | +# generated from the m4 files accompanying Automake X.Y. |
2021 | +AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) |
2022 | + |
2023 | +# AM_SET_CURRENT_AUTOMAKE_VERSION |
2024 | +# ------------------------------- |
2025 | +# Call AM_AUTOMAKE_VERSION so it can be traced. |
2026 | +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. |
2027 | +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
2028 | + [AM_AUTOMAKE_VERSION([1.9.6])]) |
2029 | + |
2030 | +# AM_AUX_DIR_EXPAND -*- Autoconf -*- |
2031 | + |
2032 | +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
2033 | +# |
2034 | +# This file is free software; the Free Software Foundation |
2035 | +# gives unlimited permission to copy and/or distribute it, |
2036 | +# with or without modifications, as long as this notice is preserved. |
2037 | + |
2038 | +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
2039 | +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to |
2040 | +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. |
2041 | +# |
2042 | +# Of course, Automake must honor this variable whenever it calls a |
2043 | +# tool from the auxiliary directory. The problem is that $srcdir (and |
2044 | +# therefore $ac_aux_dir as well) can be either absolute or relative, |
2045 | +# depending on how configure is run. This is pretty annoying, since |
2046 | +# it makes $ac_aux_dir quite unusable in subdirectories: in the top |
2047 | +# source directory, any form will work fine, but in subdirectories a |
2048 | +# relative path needs to be adjusted first. |
2049 | +# |
2050 | +# $ac_aux_dir/missing |
2051 | +# fails when called from a subdirectory if $ac_aux_dir is relative |
2052 | +# $top_srcdir/$ac_aux_dir/missing |
2053 | +# fails if $ac_aux_dir is absolute, |
2054 | +# fails when called from a subdirectory in a VPATH build with |
2055 | +# a relative $ac_aux_dir |
2056 | +# |
2057 | +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir |
2058 | +# are both prefixed by $srcdir. In an in-source build this is usually |
2059 | +# harmless because $srcdir is `.', but things will broke when you |
2060 | +# start a VPATH build or use an absolute $srcdir. |
2061 | +# |
2062 | +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, |
2063 | +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: |
2064 | +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` |
2065 | +# and then we would define $MISSING as |
2066 | +# MISSING="\${SHELL} $am_aux_dir/missing" |
2067 | +# This will work as long as MISSING is not called from configure, because |
2068 | +# unfortunately $(top_srcdir) has no meaning in configure. |
2069 | +# However there are other variables, like CC, which are often used in |
2070 | +# configure, and could therefore not use this "fixed" $ac_aux_dir. |
2071 | +# |
2072 | +# Another solution, used here, is to always expand $ac_aux_dir to an |
2073 | +# absolute PATH. The drawback is that using absolute paths prevent a |
2074 | +# configured tree to be moved without reconfiguration. |
2075 | + |
2076 | +AC_DEFUN([AM_AUX_DIR_EXPAND], |
2077 | +[dnl Rely on autoconf to set up CDPATH properly. |
2078 | +AC_PREREQ([2.50])dnl |
2079 | +# expand $ac_aux_dir to an absolute path |
2080 | +am_aux_dir=`cd $ac_aux_dir && pwd` |
2081 | +]) |
2082 | + |
2083 | +# AM_CONDITIONAL -*- Autoconf -*- |
2084 | + |
2085 | +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 |
2086 | +# Free Software Foundation, Inc. |
2087 | +# |
2088 | +# This file is free software; the Free Software Foundation |
2089 | +# gives unlimited permission to copy and/or distribute it, |
2090 | +# with or without modifications, as long as this notice is preserved. |
2091 | + |
2092 | +# serial 7 |
2093 | + |
2094 | +# AM_CONDITIONAL(NAME, SHELL-CONDITION) |
2095 | +# ------------------------------------- |
2096 | +# Define a conditional. |
2097 | +AC_DEFUN([AM_CONDITIONAL], |
2098 | +[AC_PREREQ(2.52)dnl |
2099 | + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], |
2100 | + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl |
2101 | +AC_SUBST([$1_TRUE]) |
2102 | +AC_SUBST([$1_FALSE]) |
2103 | +if $2; then |
2104 | + $1_TRUE= |
2105 | + $1_FALSE='#' |
2106 | +else |
2107 | + $1_TRUE='#' |
2108 | + $1_FALSE= |
2109 | +fi |
2110 | +AC_CONFIG_COMMANDS_PRE( |
2111 | +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then |
2112 | + AC_MSG_ERROR([[conditional "$1" was never defined. |
2113 | +Usually this means the macro was only invoked conditionally.]]) |
2114 | +fi])]) |
2115 | + |
2116 | + |
2117 | +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
2118 | +# Free Software Foundation, Inc. |
2119 | +# |
2120 | +# This file is free software; the Free Software Foundation |
2121 | +# gives unlimited permission to copy and/or distribute it, |
2122 | +# with or without modifications, as long as this notice is preserved. |
2123 | + |
2124 | +# serial 8 |
2125 | + |
2126 | +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be |
2127 | +# written in clear, in which case automake, when reading aclocal.m4, |
2128 | +# will think it sees a *use*, and therefore will trigger all it's |
2129 | +# C support machinery. Also note that it means that autoscan, seeing |
2130 | +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... |
2131 | + |
2132 | + |
2133 | +# _AM_DEPENDENCIES(NAME) |
2134 | +# ---------------------- |
2135 | +# See how the compiler implements dependency checking. |
2136 | +# NAME is "CC", "CXX", "GCJ", or "OBJC". |
2137 | +# We try a few techniques and use that to set a single cache variable. |
2138 | +# |
2139 | +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was |
2140 | +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular |
2141 | +# dependency, and given that the user is not expected to run this macro, |
2142 | +# just rely on AC_PROG_CC. |
2143 | +AC_DEFUN([_AM_DEPENDENCIES], |
2144 | +[AC_REQUIRE([AM_SET_DEPDIR])dnl |
2145 | +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl |
2146 | +AC_REQUIRE([AM_MAKE_INCLUDE])dnl |
2147 | +AC_REQUIRE([AM_DEP_TRACK])dnl |
2148 | + |
2149 | +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], |
2150 | + [$1], CXX, [depcc="$CXX" am_compiler_list=], |
2151 | + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], |
2152 | + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], |
2153 | + [depcc="$$1" am_compiler_list=]) |
2154 | + |
2155 | +AC_CACHE_CHECK([dependency style of $depcc], |
2156 | + [am_cv_$1_dependencies_compiler_type], |
2157 | +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then |
2158 | + # We make a subdir and do the tests there. Otherwise we can end up |
2159 | + # making bogus files that we don't know about and never remove. For |
2160 | + # instance it was reported that on HP-UX the gcc test will end up |
2161 | + # making a dummy file named `D' -- because `-MD' means `put the output |
2162 | + # in D'. |
2163 | + mkdir conftest.dir |
2164 | + # Copy depcomp to subdir because otherwise we won't find it if we're |
2165 | + # using a relative directory. |
2166 | + cp "$am_depcomp" conftest.dir |
2167 | + cd conftest.dir |
2168 | + # We will build objects and dependencies in a subdirectory because |
2169 | + # it helps to detect inapplicable dependency modes. For instance |
2170 | + # both Tru64's cc and ICC support -MD to output dependencies as a |
2171 | + # side effect of compilation, but ICC will put the dependencies in |
2172 | + # the current directory while Tru64 will put them in the object |
2173 | + # directory. |
2174 | + mkdir sub |
2175 | + |
2176 | + am_cv_$1_dependencies_compiler_type=none |
2177 | + if test "$am_compiler_list" = ""; then |
2178 | + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` |
2179 | + fi |
2180 | + for depmode in $am_compiler_list; do |
2181 | + # Setup a source with many dependencies, because some compilers |
2182 | + # like to wrap large dependency lists on column 80 (with \), and |
2183 | + # we should not choose a depcomp mode which is confused by this. |
2184 | + # |
2185 | + # We need to recreate these files for each test, as the compiler may |
2186 | + # overwrite some of them when testing with obscure command lines. |
2187 | + # This happens at least with the AIX C compiler. |
2188 | + : > sub/conftest.c |
2189 | + for i in 1 2 3 4 5 6; do |
2190 | + echo '#include "conftst'$i'.h"' >> sub/conftest.c |
2191 | + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with |
2192 | + # Solaris 8's {/usr,}/bin/sh. |
2193 | + touch sub/conftst$i.h |
2194 | + done |
2195 | + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
2196 | + |
2197 | + case $depmode in |
2198 | + nosideeffect) |
2199 | + # after this tag, mechanisms are not by side-effect, so they'll |
2200 | + # only be used when explicitly requested |
2201 | + if test "x$enable_dependency_tracking" = xyes; then |
2202 | + continue |
2203 | + else |
2204 | + break |
2205 | + fi |
2206 | + ;; |
2207 | + none) break ;; |
2208 | + esac |
2209 | + # We check with `-c' and `-o' for the sake of the "dashmstdout" |
2210 | + # mode. It turns out that the SunPro C++ compiler does not properly |
2211 | + # handle `-M -o', and we need to detect this. |
2212 | + if depmode=$depmode \ |
2213 | + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ |
2214 | + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ |
2215 | + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ |
2216 | + >/dev/null 2>conftest.err && |
2217 | + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && |
2218 | + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && |
2219 | + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then |
2220 | + # icc doesn't choke on unknown options, it will just issue warnings |
2221 | + # or remarks (even with -Werror). So we grep stderr for any message |
2222 | + # that says an option was ignored or not supported. |
2223 | + # When given -MP, icc 7.0 and 7.1 complain thusly: |
2224 | + # icc: Command line warning: ignoring option '-M'; no argument required |
2225 | + # The diagnosis changed in icc 8.0: |
2226 | + # icc: Command line remark: option '-MP' not supported |
2227 | + if (grep 'ignoring option' conftest.err || |
2228 | + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else |
2229 | + am_cv_$1_dependencies_compiler_type=$depmode |
2230 | + break |
2231 | + fi |
2232 | + fi |
2233 | + done |
2234 | + |
2235 | + cd .. |
2236 | + rm -rf conftest.dir |
2237 | +else |
2238 | + am_cv_$1_dependencies_compiler_type=none |
2239 | +fi |
2240 | +]) |
2241 | +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) |
2242 | +AM_CONDITIONAL([am__fastdep$1], [ |
2243 | + test "x$enable_dependency_tracking" != xno \ |
2244 | + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) |
2245 | +]) |
2246 | + |
2247 | + |
2248 | +# AM_SET_DEPDIR |
2249 | +# ------------- |
2250 | +# Choose a directory name for dependency files. |
2251 | +# This macro is AC_REQUIREd in _AM_DEPENDENCIES |
2252 | +AC_DEFUN([AM_SET_DEPDIR], |
2253 | +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl |
2254 | +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl |
2255 | +]) |
2256 | + |
2257 | + |
2258 | +# AM_DEP_TRACK |
2259 | +# ------------ |
2260 | +AC_DEFUN([AM_DEP_TRACK], |
2261 | +[AC_ARG_ENABLE(dependency-tracking, |
2262 | +[ --disable-dependency-tracking speeds up one-time build |
2263 | + --enable-dependency-tracking do not reject slow dependency extractors]) |
2264 | +if test "x$enable_dependency_tracking" != xno; then |
2265 | + am_depcomp="$ac_aux_dir/depcomp" |
2266 | + AMDEPBACKSLASH='\' |
2267 | +fi |
2268 | +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) |
2269 | +AC_SUBST([AMDEPBACKSLASH]) |
2270 | +]) |
2271 | + |
2272 | +# Generate code to set up dependency tracking. -*- Autoconf -*- |
2273 | + |
2274 | +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
2275 | +# Free Software Foundation, Inc. |
2276 | +# |
2277 | +# This file is free software; the Free Software Foundation |
2278 | +# gives unlimited permission to copy and/or distribute it, |
2279 | +# with or without modifications, as long as this notice is preserved. |
2280 | + |
2281 | +#serial 3 |
2282 | + |
2283 | +# _AM_OUTPUT_DEPENDENCY_COMMANDS |
2284 | +# ------------------------------ |
2285 | +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
2286 | +[for mf in $CONFIG_FILES; do |
2287 | + # Strip MF so we end up with the name of the file. |
2288 | + mf=`echo "$mf" | sed -e 's/:.*$//'` |
2289 | + # Check whether this is an Automake generated Makefile or not. |
2290 | + # We used to match only the files named `Makefile.in', but |
2291 | + # some people rename them; so instead we look at the file content. |
2292 | + # Grep'ing the first line is not enough: some people post-process |
2293 | + # each Makefile.in and add a new line on top of each file to say so. |
2294 | + # So let's grep whole file. |
2295 | + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then |
2296 | + dirpart=`AS_DIRNAME("$mf")` |
2297 | + else |
2298 | + continue |
2299 | + fi |
2300 | + # Extract the definition of DEPDIR, am__include, and am__quote |
2301 | + # from the Makefile without running `make'. |
2302 | + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
2303 | + test -z "$DEPDIR" && continue |
2304 | + am__include=`sed -n 's/^am__include = //p' < "$mf"` |
2305 | + test -z "am__include" && continue |
2306 | + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
2307 | + # When using ansi2knr, U may be empty or an underscore; expand it |
2308 | + U=`sed -n 's/^U = //p' < "$mf"` |
2309 | + # Find all dependency output files, they are included files with |
2310 | + # $(DEPDIR) in their names. We invoke sed twice because it is the |
2311 | + # simplest approach to changing $(DEPDIR) to its actual value in the |
2312 | + # expansion. |
2313 | + for file in `sed -n " |
2314 | + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
2315 | + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do |
2316 | + # Make sure the directory exists. |
2317 | + test -f "$dirpart/$file" && continue |
2318 | + fdir=`AS_DIRNAME(["$file"])` |
2319 | + AS_MKDIR_P([$dirpart/$fdir]) |
2320 | + # echo "creating $dirpart/$file" |
2321 | + echo '# dummy' > "$dirpart/$file" |
2322 | + done |
2323 | +done |
2324 | +])# _AM_OUTPUT_DEPENDENCY_COMMANDS |
2325 | + |
2326 | + |
2327 | +# AM_OUTPUT_DEPENDENCY_COMMANDS |
2328 | +# ----------------------------- |
2329 | +# This macro should only be invoked once -- use via AC_REQUIRE. |
2330 | +# |
2331 | +# This code is only required when automatic dependency tracking |
2332 | +# is enabled. FIXME. This creates each `.P' file that we will |
2333 | +# need in order to bootstrap the dependency handling code. |
2334 | +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], |
2335 | +[AC_CONFIG_COMMANDS([depfiles], |
2336 | + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], |
2337 | + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) |
2338 | +]) |
2339 | + |
2340 | +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 |
2341 | +# Free Software Foundation, Inc. |
2342 | +# |
2343 | +# This file is free software; the Free Software Foundation |
2344 | +# gives unlimited permission to copy and/or distribute it, |
2345 | +# with or without modifications, as long as this notice is preserved. |
2346 | + |
2347 | +# serial 8 |
2348 | + |
2349 | +# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. |
2350 | +AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) |
2351 | + |
2352 | +# Do all the work for Automake. -*- Autoconf -*- |
2353 | + |
2354 | +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
2355 | +# Free Software Foundation, Inc. |
2356 | +# |
2357 | +# This file is free software; the Free Software Foundation |
2358 | +# gives unlimited permission to copy and/or distribute it, |
2359 | +# with or without modifications, as long as this notice is preserved. |
2360 | + |
2361 | +# serial 12 |
2362 | + |
2363 | +# This macro actually does too much. Some checks are only needed if |
2364 | +# your package does certain things. But this isn't really a big deal. |
2365 | + |
2366 | +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) |
2367 | +# AM_INIT_AUTOMAKE([OPTIONS]) |
2368 | +# ----------------------------------------------- |
2369 | +# The call with PACKAGE and VERSION arguments is the old style |
2370 | +# call (pre autoconf-2.50), which is being phased out. PACKAGE |
2371 | +# and VERSION should now be passed to AC_INIT and removed from |
2372 | +# the call to AM_INIT_AUTOMAKE. |
2373 | +# We support both call styles for the transition. After |
2374 | +# the next Automake release, Autoconf can make the AC_INIT |
2375 | +# arguments mandatory, and then we can depend on a new Autoconf |
2376 | +# release and drop the old call support. |
2377 | +AC_DEFUN([AM_INIT_AUTOMAKE], |
2378 | +[AC_PREREQ([2.58])dnl |
2379 | +dnl Autoconf wants to disallow AM_ names. We explicitly allow |
2380 | +dnl the ones we care about. |
2381 | +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl |
2382 | +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl |
2383 | +AC_REQUIRE([AC_PROG_INSTALL])dnl |
2384 | +# test to see if srcdir already configured |
2385 | +if test "`cd $srcdir && pwd`" != "`pwd`" && |
2386 | + test -f $srcdir/config.status; then |
2387 | + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) |
2388 | +fi |
2389 | + |
2390 | +# test whether we have cygpath |
2391 | +if test -z "$CYGPATH_W"; then |
2392 | + if (cygpath --version) >/dev/null 2>/dev/null; then |
2393 | + CYGPATH_W='cygpath -w' |
2394 | + else |
2395 | + CYGPATH_W=echo |
2396 | + fi |
2397 | +fi |
2398 | +AC_SUBST([CYGPATH_W]) |
2399 | + |
2400 | +# Define the identity of the package. |
2401 | +dnl Distinguish between old-style and new-style calls. |
2402 | +m4_ifval([$2], |
2403 | +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl |
2404 | + AC_SUBST([PACKAGE], [$1])dnl |
2405 | + AC_SUBST([VERSION], [$2])], |
2406 | +[_AM_SET_OPTIONS([$1])dnl |
2407 | + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl |
2408 | + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl |
2409 | + |
2410 | +_AM_IF_OPTION([no-define],, |
2411 | +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) |
2412 | + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl |
2413 | + |
2414 | +# Some tools Automake needs. |
2415 | +AC_REQUIRE([AM_SANITY_CHECK])dnl |
2416 | +AC_REQUIRE([AC_ARG_PROGRAM])dnl |
2417 | +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) |
2418 | +AM_MISSING_PROG(AUTOCONF, autoconf) |
2419 | +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) |
2420 | +AM_MISSING_PROG(AUTOHEADER, autoheader) |
2421 | +AM_MISSING_PROG(MAKEINFO, makeinfo) |
2422 | +AM_PROG_INSTALL_SH |
2423 | +AM_PROG_INSTALL_STRIP |
2424 | +AC_REQUIRE([AM_PROG_MKDIR_P])dnl |
2425 | +# We need awk for the "check" target. The system "awk" is bad on |
2426 | +# some platforms. |
2427 | +AC_REQUIRE([AC_PROG_AWK])dnl |
2428 | +AC_REQUIRE([AC_PROG_MAKE_SET])dnl |
2429 | +AC_REQUIRE([AM_SET_LEADING_DOT])dnl |
2430 | +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], |
2431 | + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], |
2432 | + [_AM_PROG_TAR([v7])])]) |
2433 | +_AM_IF_OPTION([no-dependencies],, |
2434 | +[AC_PROVIDE_IFELSE([AC_PROG_CC], |
2435 | + [_AM_DEPENDENCIES(CC)], |
2436 | + [define([AC_PROG_CC], |
2437 | + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl |
2438 | +AC_PROVIDE_IFELSE([AC_PROG_CXX], |
2439 | + [_AM_DEPENDENCIES(CXX)], |
2440 | + [define([AC_PROG_CXX], |
2441 | + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl |
2442 | +]) |
2443 | +]) |
2444 | + |
2445 | + |
2446 | +# When config.status generates a header, we must update the stamp-h file. |
2447 | +# This file resides in the same directory as the config header |
2448 | +# that is generated. The stamp files are numbered to have different names. |
2449 | + |
2450 | +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the |
2451 | +# loop where config.status creates the headers, so we can generate |
2452 | +# our stamp files there. |
2453 | +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], |
2454 | +[# Compute $1's index in $config_headers. |
2455 | +_am_stamp_count=1 |
2456 | +for _am_header in $config_headers :; do |
2457 | + case $_am_header in |
2458 | + $1 | $1:* ) |
2459 | + break ;; |
2460 | + * ) |
2461 | + _am_stamp_count=`expr $_am_stamp_count + 1` ;; |
2462 | + esac |
2463 | +done |
2464 | +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) |
2465 | + |
2466 | +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
2467 | +# |
2468 | +# This file is free software; the Free Software Foundation |
2469 | +# gives unlimited permission to copy and/or distribute it, |
2470 | +# with or without modifications, as long as this notice is preserved. |
2471 | + |
2472 | +# AM_PROG_INSTALL_SH |
2473 | +# ------------------ |
2474 | +# Define $install_sh. |
2475 | +AC_DEFUN([AM_PROG_INSTALL_SH], |
2476 | +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
2477 | +install_sh=${install_sh-"$am_aux_dir/install-sh"} |
2478 | +AC_SUBST(install_sh)]) |
2479 | + |
2480 | +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. |
2481 | +# |
2482 | +# This file is free software; the Free Software Foundation |
2483 | +# gives unlimited permission to copy and/or distribute it, |
2484 | +# with or without modifications, as long as this notice is preserved. |
2485 | + |
2486 | +# serial 2 |
2487 | + |
2488 | +# Check whether the underlying file-system supports filenames |
2489 | +# with a leading dot. For instance MS-DOS doesn't. |
2490 | +AC_DEFUN([AM_SET_LEADING_DOT], |
2491 | +[rm -rf .tst 2>/dev/null |
2492 | +mkdir .tst 2>/dev/null |
2493 | +if test -d .tst; then |
2494 | + am__leading_dot=. |
2495 | +else |
2496 | + am__leading_dot=_ |
2497 | +fi |
2498 | +rmdir .tst 2>/dev/null |
2499 | +AC_SUBST([am__leading_dot])]) |
2500 | |
2501 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
2502 | |
2503 | -# serial 49 AC_PROG_LIBTOOL |
2504 | +# serial 47 AC_PROG_LIBTOOL |
2505 | |
2506 | |
2507 | # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) |
2508 | @@ -128,7 +613,7 @@ |
2509 | |
2510 | # Sed substitution that helps us do robust quoting. It backslashifies |
2511 | # metacharacters that are still active within double-quoted strings. |
2512 | -Xsed='sed -e 1s/^X//' |
2513 | +Xsed='sed -e s/^X//' |
2514 | [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] |
2515 | |
2516 | # Same as above, but do not quote variable references. |
2517 | @@ -148,7 +633,7 @@ |
2518 | default_ofile=libtool |
2519 | can_build_shared=yes |
2520 | |
2521 | -# All known linkers require a `.a' archive for static linking (except MSVC, |
2522 | +# All known linkers require a `.a' archive for static linking (except M$VC, |
2523 | # which needs '.lib'). |
2524 | libext=a |
2525 | ltmain="$ac_aux_dir/ltmain.sh" |
2526 | @@ -168,7 +653,6 @@ |
2527 | test -z "$AS" && AS=as |
2528 | test -z "$CC" && CC=cc |
2529 | test -z "$LTCC" && LTCC=$CC |
2530 | -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS |
2531 | test -z "$DLLTOOL" && DLLTOOL=dlltool |
2532 | test -z "$LD" && LD=ld |
2533 | test -z "$LN_S" && LN_S="ln -s" |
2534 | @@ -188,16 +672,16 @@ |
2535 | if test -n "$RANLIB"; then |
2536 | case $host_os in |
2537 | openbsd*) |
2538 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" |
2539 | + old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" |
2540 | ;; |
2541 | *) |
2542 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" |
2543 | + old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" |
2544 | ;; |
2545 | esac |
2546 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
2547 | fi |
2548 | |
2549 | -_LT_CC_BASENAME([$compiler]) |
2550 | +cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` |
2551 | |
2552 | # Only perform the check for file, if the check method requires it |
2553 | case $deplibs_check_method in |
2554 | @@ -239,56 +723,11 @@ |
2555 | # If no C compiler was specified, use CC. |
2556 | LTCC=${LTCC-"$CC"} |
2557 | |
2558 | -# If no C compiler flags were specified, use CFLAGS. |
2559 | -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} |
2560 | - |
2561 | # Allow CC to be a program name with arguments. |
2562 | compiler=$CC |
2563 | ])# _LT_AC_SYS_COMPILER |
2564 | |
2565 | |
2566 | -# _LT_CC_BASENAME(CC) |
2567 | -# ------------------- |
2568 | -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. |
2569 | -AC_DEFUN([_LT_CC_BASENAME], |
2570 | -[for cc_temp in $1""; do |
2571 | - case $cc_temp in |
2572 | - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; |
2573 | - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; |
2574 | - \-*) ;; |
2575 | - *) break;; |
2576 | - esac |
2577 | -done |
2578 | -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
2579 | -]) |
2580 | - |
2581 | - |
2582 | -# _LT_COMPILER_BOILERPLATE |
2583 | -# ------------------------ |
2584 | -# Check for compiler boilerplate output or warnings with |
2585 | -# the simple compiler test code. |
2586 | -AC_DEFUN([_LT_COMPILER_BOILERPLATE], |
2587 | -[ac_outfile=conftest.$ac_objext |
2588 | -echo "$lt_simple_compile_test_code" >conftest.$ac_ext |
2589 | -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err |
2590 | -_lt_compiler_boilerplate=`cat conftest.err` |
2591 | -$rm conftest* |
2592 | -])# _LT_COMPILER_BOILERPLATE |
2593 | - |
2594 | - |
2595 | -# _LT_LINKER_BOILERPLATE |
2596 | -# ---------------------- |
2597 | -# Check for linker boilerplate output or warnings with |
2598 | -# the simple link test code. |
2599 | -AC_DEFUN([_LT_LINKER_BOILERPLATE], |
2600 | -[ac_outfile=conftest.$ac_objext |
2601 | -echo "$lt_simple_link_test_code" >conftest.$ac_ext |
2602 | -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err |
2603 | -_lt_linker_boilerplate=`cat conftest.err` |
2604 | -$rm conftest* |
2605 | -])# _LT_LINKER_BOILERPLATE |
2606 | - |
2607 | - |
2608 | # _LT_AC_SYS_LIBPATH_AIX |
2609 | # ---------------------- |
2610 | # Links a minimal program and checks the executable |
2611 | @@ -299,18 +738,11 @@ |
2612 | # to the aix ld manual. |
2613 | AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], |
2614 | [AC_LINK_IFELSE(AC_LANG_PROGRAM,[ |
2615 | -lt_aix_libpath_sed=' |
2616 | - /Import File Strings/,/^$/ { |
2617 | - /^0/ { |
2618 | - s/^0 *\(.*\)$/\1/ |
2619 | - p |
2620 | - } |
2621 | - }' |
2622 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
2623 | +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } |
2624 | +}'` |
2625 | # Check for a 64-bit object if we didn't find anything. |
2626 | -if test -z "$aix_libpath"; then |
2627 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
2628 | -fi],[]) |
2629 | +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } |
2630 | +}'`; fi],[]) |
2631 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
2632 | ])# _LT_AC_SYS_LIBPATH_AIX |
2633 | |
2634 | @@ -375,8 +807,8 @@ |
2635 | # find a string as large as possible, as long as the shell can cope with it |
2636 | for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do |
2637 | # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... |
2638 | - if (echo_test_string=`eval $cmd`) 2>/dev/null && |
2639 | - echo_test_string=`eval $cmd` && |
2640 | + if (echo_test_string="`eval $cmd`") 2>/dev/null && |
2641 | + echo_test_string="`eval $cmd`" && |
2642 | (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null |
2643 | then |
2644 | break |
2645 | @@ -541,17 +973,13 @@ |
2646 | rm -rf conftest* |
2647 | ;; |
2648 | |
2649 | -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ |
2650 | -s390*-*linux*|sparc*-*linux*) |
2651 | +x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) |
2652 | # Find out which ABI we are using. |
2653 | echo 'int i;' > conftest.$ac_ext |
2654 | if AC_TRY_EVAL(ac_compile); then |
2655 | - case `/usr/bin/file conftest.o` in |
2656 | + case "`/usr/bin/file conftest.o`" in |
2657 | *32-bit*) |
2658 | case $host in |
2659 | - x86_64-*kfreebsd*-gnu) |
2660 | - LD="${LD-ld} -m elf_i386_fbsd" |
2661 | - ;; |
2662 | x86_64-*linux*) |
2663 | LD="${LD-ld} -m elf_i386" |
2664 | ;; |
2665 | @@ -568,9 +996,6 @@ |
2666 | ;; |
2667 | *64-bit*) |
2668 | case $host in |
2669 | - x86_64-*kfreebsd*-gnu) |
2670 | - LD="${LD-ld} -m elf_x86_64_fbsd" |
2671 | - ;; |
2672 | x86_64-*linux*) |
2673 | LD="${LD-ld} -m elf_x86_64" |
2674 | ;; |
2675 | @@ -603,22 +1028,6 @@ |
2676 | CFLAGS="$SAVE_CFLAGS" |
2677 | fi |
2678 | ;; |
2679 | -sparc*-*solaris*) |
2680 | - # Find out which ABI we are using. |
2681 | - echo 'int i;' > conftest.$ac_ext |
2682 | - if AC_TRY_EVAL(ac_compile); then |
2683 | - case `/usr/bin/file conftest.o` in |
2684 | - *64-bit*) |
2685 | - case $lt_cv_prog_gnu_ld in |
2686 | - yes*) LD="${LD-ld} -m elf64_sparc" ;; |
2687 | - *) LD="${LD-ld} -64" ;; |
2688 | - esac |
2689 | - ;; |
2690 | - esac |
2691 | - fi |
2692 | - rm -rf conftest* |
2693 | - ;; |
2694 | - |
2695 | AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], |
2696 | [*-*-cygwin* | *-*-mingw* | *-*-pw32*) |
2697 | AC_CHECK_TOOL(DLLTOOL, dlltool, false) |
2698 | @@ -642,7 +1051,7 @@ |
2699 | AC_CACHE_CHECK([$1], [$2], |
2700 | [$2=no |
2701 | ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) |
2702 | - echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
2703 | + printf "$lt_simple_compile_test_code" > conftest.$ac_ext |
2704 | lt_compiler_flag="$3" |
2705 | # Insert the option either (1) after the last *FLAGS variable, or |
2706 | # (2) before a word containing "conftest.", or (3) at the end. |
2707 | @@ -650,7 +1059,7 @@ |
2708 | # with a dollar sign (not a hyphen), so the echo should work correctly. |
2709 | # The option is referenced via a variable to avoid confusing sed. |
2710 | lt_compile=`echo "$ac_compile" | $SED \ |
2711 | - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
2712 | + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
2713 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
2714 | -e 's:$: $lt_compiler_flag:'` |
2715 | (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
2716 | @@ -660,10 +1069,8 @@ |
2717 | echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
2718 | if (exit $ac_status) && test -s "$ac_outfile"; then |
2719 | # The compiler can only warn and ignore the option if not recognized |
2720 | - # So say no if there are warnings other than the usual output. |
2721 | - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp |
2722 | - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
2723 | - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
2724 | + # So say no if there are warnings |
2725 | + if test ! -s conftest.err; then |
2726 | $2=yes |
2727 | fi |
2728 | fi |
2729 | @@ -687,18 +1094,13 @@ |
2730 | [$2=no |
2731 | save_LDFLAGS="$LDFLAGS" |
2732 | LDFLAGS="$LDFLAGS $3" |
2733 | - echo "$lt_simple_link_test_code" > conftest.$ac_ext |
2734 | + printf "$lt_simple_link_test_code" > conftest.$ac_ext |
2735 | if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then |
2736 | - # The linker can only warn and ignore the option if not recognized |
2737 | + # The compiler can only warn and ignore the option if not recognized |
2738 | # So say no if there are warnings |
2739 | if test -s conftest.err; then |
2740 | # Append any errors to the config.log. |
2741 | cat conftest.err 1>&AS_MESSAGE_LOG_FD |
2742 | - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp |
2743 | - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
2744 | - if diff conftest.exp conftest.er2 >/dev/null; then |
2745 | - $2=yes |
2746 | - fi |
2747 | else |
2748 | $2=yes |
2749 | fi |
2750 | @@ -757,50 +1159,20 @@ |
2751 | lt_cv_sys_max_cmd_len=8192; |
2752 | ;; |
2753 | |
2754 | - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) |
2755 | + netbsd* | freebsd* | openbsd* | darwin* ) |
2756 | # This has been around since 386BSD, at least. Likely further. |
2757 | if test -x /sbin/sysctl; then |
2758 | lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` |
2759 | elif test -x /usr/sbin/sysctl; then |
2760 | lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` |
2761 | else |
2762 | - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs |
2763 | + lt_cv_sys_max_cmd_len=65536 # usable default for *BSD |
2764 | fi |
2765 | # And add a safety zone |
2766 | lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` |
2767 | - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` |
2768 | - ;; |
2769 | - |
2770 | - interix*) |
2771 | - # We know the value 262144 and hardcode it with a safety zone (like BSD) |
2772 | - lt_cv_sys_max_cmd_len=196608 |
2773 | - ;; |
2774 | - |
2775 | - osf*) |
2776 | - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
2777 | - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
2778 | - # nice to cause kernel panics so lets avoid the loop below. |
2779 | - # First set a reasonable default. |
2780 | - lt_cv_sys_max_cmd_len=16384 |
2781 | - # |
2782 | - if test -x /sbin/sysconfig; then |
2783 | - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in |
2784 | - *1*) lt_cv_sys_max_cmd_len=-1 ;; |
2785 | - esac |
2786 | - fi |
2787 | - ;; |
2788 | - sco3.2v5*) |
2789 | - lt_cv_sys_max_cmd_len=102400 |
2790 | - ;; |
2791 | - sysv5* | sco5v6* | sysv4.2uw2*) |
2792 | - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` |
2793 | - if test -n "$kargmax"; then |
2794 | - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` |
2795 | - else |
2796 | - lt_cv_sys_max_cmd_len=32768 |
2797 | - fi |
2798 | - ;; |
2799 | - *) |
2800 | + ;; |
2801 | + |
2802 | + *) |
2803 | # If test is not a shell built-in, we'll probably end up computing a |
2804 | # maximum length that is only half of the actual maximum length, but |
2805 | # we can't tell. |
2806 | @@ -831,7 +1203,7 @@ |
2807 | |
2808 | |
2809 | # _LT_AC_CHECK_DLFCN |
2810 | -# ------------------ |
2811 | +# -------------------- |
2812 | AC_DEFUN([_LT_AC_CHECK_DLFCN], |
2813 | [AC_CHECK_HEADERS(dlfcn.h)dnl |
2814 | ])# _LT_AC_CHECK_DLFCN |
2815 | @@ -839,7 +1211,7 @@ |
2816 | |
2817 | # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, |
2818 | # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) |
2819 | -# --------------------------------------------------------------------- |
2820 | +# ------------------------------------------------------------------ |
2821 | AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], |
2822 | [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl |
2823 | if test "$cross_compiling" = yes; then : |
2824 | @@ -905,19 +1277,17 @@ |
2825 | else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
2826 | /* dlclose (self); */ |
2827 | } |
2828 | - else |
2829 | - puts (dlerror ()); |
2830 | |
2831 | exit (status); |
2832 | }] |
2833 | EOF |
2834 | if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then |
2835 | - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null |
2836 | + (./conftest; exit; ) 2>/dev/null |
2837 | lt_status=$? |
2838 | case x$lt_status in |
2839 | x$lt_dlno_uscore) $1 ;; |
2840 | x$lt_dlneed_uscore) $2 ;; |
2841 | - x$lt_dlunknown|x*) $3 ;; |
2842 | + x$lt_unknown|x*) $3 ;; |
2843 | esac |
2844 | else : |
2845 | # compilation failed |
2846 | @@ -929,7 +1299,7 @@ |
2847 | |
2848 | |
2849 | # AC_LIBTOOL_DLOPEN_SELF |
2850 | -# ---------------------- |
2851 | +# ------------------- |
2852 | AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], |
2853 | [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl |
2854 | if test "x$enable_dlopen" != xyes; then |
2855 | @@ -1000,7 +1370,7 @@ |
2856 | test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" |
2857 | |
2858 | save_LDFLAGS="$LDFLAGS" |
2859 | - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" |
2860 | + eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" |
2861 | |
2862 | save_LIBS="$LIBS" |
2863 | LIBS="$lt_cv_dlopen_libs $LIBS" |
2864 | @@ -1013,7 +1383,7 @@ |
2865 | ]) |
2866 | |
2867 | if test "x$lt_cv_dlopen_self" = xyes; then |
2868 | - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" |
2869 | + LDFLAGS="$LDFLAGS $link_static_flag" |
2870 | AC_CACHE_CHECK([whether a statically linked program can dlopen itself], |
2871 | lt_cv_dlopen_self_static, [dnl |
2872 | _LT_AC_TRY_DLOPEN_SELF( |
2873 | @@ -1053,7 +1423,7 @@ |
2874 | mkdir conftest |
2875 | cd conftest |
2876 | mkdir out |
2877 | - echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
2878 | + printf "$lt_simple_compile_test_code" > conftest.$ac_ext |
2879 | |
2880 | lt_compiler_flag="-o out/conftest2.$ac_objext" |
2881 | # Insert the option either (1) after the last *FLAGS variable, or |
2882 | @@ -1061,7 +1431,7 @@ |
2883 | # Note that $ac_compile itself does not contain backslashes and begins |
2884 | # with a dollar sign (not a hyphen), so the echo should work correctly. |
2885 | lt_compile=`echo "$ac_compile" | $SED \ |
2886 | - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
2887 | + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
2888 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
2889 | -e 's:$: $lt_compiler_flag:'` |
2890 | (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
2891 | @@ -1073,13 +1443,11 @@ |
2892 | then |
2893 | # The compiler can only warn and ignore the option if not recognized |
2894 | # So say no if there are warnings |
2895 | - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp |
2896 | - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
2897 | - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then |
2898 | + if test ! -s out/conftest.err; then |
2899 | _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes |
2900 | fi |
2901 | fi |
2902 | - chmod u+w . 2>&AS_MESSAGE_LOG_FD |
2903 | + chmod u+w . |
2904 | $rm conftest* |
2905 | # SGI C++ compiler will create directory out/ii_files/ for |
2906 | # template instantiation |
2907 | @@ -1339,8 +1707,7 @@ |
2908 | dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ |
2909 | dldir=$destdir/`dirname \$dlpath`~ |
2910 | test -d \$dldir || mkdir -p \$dldir~ |
2911 | - $install_prog $dir/$dlname \$dldir/$dlname~ |
2912 | - chmod a+x \$dldir/$dlname' |
2913 | + $install_prog $dir/$dlname \$dldir/$dlname' |
2914 | postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
2915 | dlpath=$dir/\$dldll~ |
2916 | $rm \$dlpath' |
2917 | @@ -1370,7 +1737,7 @@ |
2918 | ;; |
2919 | pw32*) |
2920 | # pw32 DLLs use 'pw' prefix rather than 'lib' |
2921 | - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
2922 | + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
2923 | ;; |
2924 | esac |
2925 | ;; |
2926 | @@ -1393,7 +1760,7 @@ |
2927 | soname_spec='${libname}${release}${major}$shared_ext' |
2928 | shlibpath_overrides_runpath=yes |
2929 | shlibpath_var=DYLD_LIBRARY_PATH |
2930 | - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
2931 | + shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' |
2932 | # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. |
2933 | if test "$GCC" = yes; then |
2934 | sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` |
2935 | @@ -1416,17 +1783,20 @@ |
2936 | dynamic_linker=no |
2937 | ;; |
2938 | |
2939 | -freebsd* | dragonfly*) |
2940 | - # DragonFly does not have aout. When/if they implement a new |
2941 | - # versioning mechanism, adjust this. |
2942 | - if test -x /usr/bin/objformat; then |
2943 | - objformat=`/usr/bin/objformat` |
2944 | - else |
2945 | - case $host_os in |
2946 | - freebsd[[123]]*) objformat=aout ;; |
2947 | - *) objformat=elf ;; |
2948 | - esac |
2949 | - fi |
2950 | +kfreebsd*-gnu) |
2951 | + version_type=linux |
2952 | + need_lib_prefix=no |
2953 | + need_version=no |
2954 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
2955 | + soname_spec='${libname}${release}${shared_ext}$major' |
2956 | + shlibpath_var=LD_LIBRARY_PATH |
2957 | + shlibpath_overrides_runpath=no |
2958 | + hardcode_into_libs=yes |
2959 | + dynamic_linker='GNU ld.so' |
2960 | + ;; |
2961 | + |
2962 | +freebsd*) |
2963 | + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
2964 | version_type=freebsd-$objformat |
2965 | case $version_type in |
2966 | freebsd-elf*) |
2967 | @@ -1444,19 +1814,14 @@ |
2968 | freebsd2*) |
2969 | shlibpath_overrides_runpath=yes |
2970 | ;; |
2971 | - freebsd3.[[01]]* | freebsdelf3.[[01]]*) |
2972 | + freebsd3.[01]* | freebsdelf3.[01]*) |
2973 | shlibpath_overrides_runpath=yes |
2974 | hardcode_into_libs=yes |
2975 | ;; |
2976 | - freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ |
2977 | - freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) |
2978 | + *) # from 3.2 on |
2979 | shlibpath_overrides_runpath=no |
2980 | hardcode_into_libs=yes |
2981 | ;; |
2982 | - *) # from 4.6 on, and DragonFly |
2983 | - shlibpath_overrides_runpath=yes |
2984 | - hardcode_into_libs=yes |
2985 | - ;; |
2986 | esac |
2987 | ;; |
2988 | |
2989 | @@ -1476,7 +1841,7 @@ |
2990 | version_type=sunos |
2991 | need_lib_prefix=no |
2992 | need_version=no |
2993 | - case $host_cpu in |
2994 | + case "$host_cpu" in |
2995 | ia64*) |
2996 | shrext_cmds='.so' |
2997 | hardcode_into_libs=yes |
2998 | @@ -1516,18 +1881,6 @@ |
2999 | postinstall_cmds='chmod 555 $lib' |
3000 | ;; |
3001 | |
3002 | -interix3*) |
3003 | - version_type=linux |
3004 | - need_lib_prefix=no |
3005 | - need_version=no |
3006 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
3007 | - soname_spec='${libname}${release}${shared_ext}$major' |
3008 | - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' |
3009 | - shlibpath_var=LD_LIBRARY_PATH |
3010 | - shlibpath_overrides_runpath=no |
3011 | - hardcode_into_libs=yes |
3012 | - ;; |
3013 | - |
3014 | irix5* | irix6* | nonstopux*) |
3015 | case $host_os in |
3016 | nonstopux*) version_type=nonstopux ;; |
3017 | @@ -1571,7 +1924,7 @@ |
3018 | ;; |
3019 | |
3020 | # This must be Linux ELF. |
3021 | -linux* | k*bsd*-gnu) |
3022 | +linux*) |
3023 | version_type=linux |
3024 | need_lib_prefix=no |
3025 | need_version=no |
3026 | @@ -1587,7 +1940,7 @@ |
3027 | |
3028 | # Append ld.so.conf contents to the search path |
3029 | if test -f /etc/ld.so.conf; then |
3030 | - 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/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` |
3031 | + lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '` |
3032 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
3033 | fi |
3034 | |
3035 | @@ -1600,6 +1953,18 @@ |
3036 | dynamic_linker='GNU/Linux ld.so' |
3037 | ;; |
3038 | |
3039 | +knetbsd*-gnu) |
3040 | + version_type=linux |
3041 | + need_lib_prefix=no |
3042 | + need_version=no |
3043 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
3044 | + soname_spec='${libname}${release}${shared_ext}$major' |
3045 | + shlibpath_var=LD_LIBRARY_PATH |
3046 | + shlibpath_overrides_runpath=no |
3047 | + hardcode_into_libs=yes |
3048 | + dynamic_linker='GNU ld.so' |
3049 | + ;; |
3050 | + |
3051 | netbsd*) |
3052 | version_type=sunos |
3053 | need_lib_prefix=no |
3054 | @@ -1637,13 +2002,8 @@ |
3055 | |
3056 | openbsd*) |
3057 | version_type=sunos |
3058 | - sys_lib_dlsearch_path_spec="/usr/lib" |
3059 | need_lib_prefix=no |
3060 | - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. |
3061 | - case $host_os in |
3062 | - openbsd3.3 | openbsd3.3.*) need_version=yes ;; |
3063 | - *) need_version=no ;; |
3064 | - esac |
3065 | + need_version=no |
3066 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' |
3067 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' |
3068 | shlibpath_var=LD_LIBRARY_PATH |
3069 | @@ -1681,8 +2041,11 @@ |
3070 | sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" |
3071 | ;; |
3072 | |
3073 | -rdos*) |
3074 | - dynamic_linker=no |
3075 | +sco3.2v5*) |
3076 | + version_type=osf |
3077 | + soname_spec='${libname}${release}${shared_ext}$major' |
3078 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3079 | + shlibpath_var=LD_LIBRARY_PATH |
3080 | ;; |
3081 | |
3082 | solaris*) |
3083 | @@ -1710,7 +2073,7 @@ |
3084 | need_version=yes |
3085 | ;; |
3086 | |
3087 | -sysv4 | sysv4.3*) |
3088 | +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) |
3089 | version_type=linux |
3090 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3091 | soname_spec='${libname}${release}${shared_ext}$major' |
3092 | @@ -1743,29 +2106,6 @@ |
3093 | fi |
3094 | ;; |
3095 | |
3096 | -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) |
3097 | - version_type=freebsd-elf |
3098 | - need_lib_prefix=no |
3099 | - need_version=no |
3100 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
3101 | - soname_spec='${libname}${release}${shared_ext}$major' |
3102 | - shlibpath_var=LD_LIBRARY_PATH |
3103 | - hardcode_into_libs=yes |
3104 | - if test "$with_gnu_ld" = yes; then |
3105 | - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' |
3106 | - shlibpath_overrides_runpath=no |
3107 | - else |
3108 | - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' |
3109 | - shlibpath_overrides_runpath=yes |
3110 | - case $host_os in |
3111 | - sco3.2v5*) |
3112 | - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" |
3113 | - ;; |
3114 | - esac |
3115 | - fi |
3116 | - sys_lib_dlsearch_path_spec='/usr/lib' |
3117 | - ;; |
3118 | - |
3119 | uts4*) |
3120 | version_type=linux |
3121 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3122 | @@ -1779,11 +2119,6 @@ |
3123 | esac |
3124 | AC_MSG_RESULT([$dynamic_linker]) |
3125 | test "$dynamic_linker" = no && can_build_shared=no |
3126 | - |
3127 | -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" |
3128 | -if test "$GCC" = yes; then |
3129 | - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
3130 | -fi |
3131 | ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER |
3132 | |
3133 | |
3134 | @@ -1808,9 +2143,6 @@ |
3135 | AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) |
3136 | fi |
3137 | fi |
3138 | - if test -z "$LTCFLAGS"; then |
3139 | - eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" |
3140 | - fi |
3141 | |
3142 | # Extract list of available tagged configurations in $ofile. |
3143 | # Note that this assumes the entire list is on one line. |
3144 | @@ -1838,7 +2170,7 @@ |
3145 | case $tagname in |
3146 | CXX) |
3147 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
3148 | - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
3149 | + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
3150 | (test "X$CXX" != "Xg++"))) ; then |
3151 | AC_LIBTOOL_LANG_CXX_CONFIG |
3152 | else |
3153 | @@ -1901,7 +2233,7 @@ |
3154 | |
3155 | # AC_LIBTOOL_WIN32_DLL |
3156 | # -------------------- |
3157 | -# declare package support for building win32 DLLs |
3158 | +# declare package support for building win32 dll's |
3159 | AC_DEFUN([AC_LIBTOOL_WIN32_DLL], |
3160 | [AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) |
3161 | ])# AC_LIBTOOL_WIN32_DLL |
3162 | @@ -1939,7 +2271,7 @@ |
3163 | |
3164 | # AC_DISABLE_SHARED |
3165 | # ----------------- |
3166 | -# set the default shared flag to --disable-shared |
3167 | +#- set the default shared flag to --disable-shared |
3168 | AC_DEFUN([AC_DISABLE_SHARED], |
3169 | [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl |
3170 | AC_ENABLE_SHARED(no) |
3171 | @@ -2051,7 +2383,7 @@ |
3172 | |
3173 | # AC_PATH_TOOL_PREFIX |
3174 | # ------------------- |
3175 | -# find a file program which can recognize shared library |
3176 | +# find a file program which can recognise shared library |
3177 | AC_DEFUN([AC_PATH_TOOL_PREFIX], |
3178 | [AC_REQUIRE([AC_PROG_EGREP])dnl |
3179 | AC_MSG_CHECKING([for $1]) |
3180 | @@ -2075,7 +2407,7 @@ |
3181 | if test -n "$file_magic_test_file"; then |
3182 | case $deplibs_check_method in |
3183 | "file_magic "*) |
3184 | - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` |
3185 | + file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" |
3186 | MAGIC_CMD="$lt_cv_path_MAGIC_CMD" |
3187 | if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | |
3188 | $EGREP "$file_magic_regex" > /dev/null; then |
3189 | @@ -2114,7 +2446,7 @@ |
3190 | |
3191 | # AC_PATH_MAGIC |
3192 | # ------------- |
3193 | -# find a file program which can recognize a shared library |
3194 | +# find a file program which can recognise a shared library |
3195 | AC_DEFUN([AC_PATH_MAGIC], |
3196 | [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) |
3197 | if test -z "$lt_cv_path_MAGIC_CMD"; then |
3198 | @@ -2185,7 +2517,7 @@ |
3199 | if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then |
3200 | lt_cv_path_LD="$ac_dir/$ac_prog" |
3201 | # Check to see if the program is GNU ld. I'd rather use --version, |
3202 | - # but apparently some variants of GNU ld only accept -v. |
3203 | + # but apparently some GNU ld's only accept -v. |
3204 | # Break only if it was the GNU/non-GNU ld that we prefer. |
3205 | case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in |
3206 | *GNU* | *'with BFD'*) |
3207 | @@ -2217,7 +2549,7 @@ |
3208 | AC_DEFUN([AC_PROG_LD_GNU], |
3209 | [AC_REQUIRE([AC_PROG_EGREP])dnl |
3210 | AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, |
3211 | -[# I'd rather use --version here, but apparently some GNU lds only accept -v. |
3212 | +[# I'd rather use --version here, but apparently some GNU ld's only accept -v. |
3213 | case `$LD -v 2>&1 </dev/null` in |
3214 | *GNU* | *'with BFD'*) |
3215 | lt_cv_prog_gnu_ld=yes |
3216 | @@ -2247,7 +2579,7 @@ |
3217 | case $host_os in |
3218 | darwin*) |
3219 | if test "$GCC" = yes; then |
3220 | - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
3221 | + reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs' |
3222 | else |
3223 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
3224 | fi |
3225 | @@ -2261,7 +2593,7 @@ |
3226 | # how to check for library dependencies |
3227 | # -- PORTME fill in with the dynamic library characteristics |
3228 | AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], |
3229 | -[AC_CACHE_CHECK([how to recognize dependent libraries], |
3230 | +[AC_CACHE_CHECK([how to recognise dependent libraries], |
3231 | lt_cv_deplibs_check_method, |
3232 | [lt_cv_file_magic_cmd='$MAGIC_CMD' |
3233 | lt_cv_file_magic_test_file= |
3234 | @@ -2300,28 +2632,22 @@ |
3235 | |
3236 | mingw* | pw32*) |
3237 | # Base MSYS/MinGW do not provide the 'file' command needed by |
3238 | - # func_win32_libid shell function, so use a weaker test based on 'objdump', |
3239 | - # unless we find 'file', for example because we are cross-compiling. |
3240 | - if ( file / ) >/dev/null 2>&1; then |
3241 | - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
3242 | - lt_cv_file_magic_cmd='func_win32_libid' |
3243 | - else |
3244 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
3245 | - lt_cv_file_magic_cmd='$OBJDUMP -f' |
3246 | - fi |
3247 | + # func_win32_libid shell function, so use a weaker test based on 'objdump'. |
3248 | + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
3249 | + lt_cv_file_magic_cmd='$OBJDUMP -f' |
3250 | ;; |
3251 | |
3252 | darwin* | rhapsody*) |
3253 | lt_cv_deplibs_check_method=pass_all |
3254 | ;; |
3255 | |
3256 | -freebsd* | dragonfly*) |
3257 | +freebsd* | kfreebsd*-gnu) |
3258 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then |
3259 | case $host_cpu in |
3260 | i*86 ) |
3261 | # Not sure whether the presence of OpenBSD here was a mistake. |
3262 | # Let's accept both of them until this is cleared up. |
3263 | - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' |
3264 | + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' |
3265 | lt_cv_file_magic_cmd=/usr/bin/file |
3266 | lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` |
3267 | ;; |
3268 | @@ -2337,7 +2663,7 @@ |
3269 | |
3270 | hpux10.20* | hpux11*) |
3271 | lt_cv_file_magic_cmd=/usr/bin/file |
3272 | - case $host_cpu in |
3273 | + case "$host_cpu" in |
3274 | ia64*) |
3275 | lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' |
3276 | lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so |
3277 | @@ -2353,11 +2679,6 @@ |
3278 | esac |
3279 | ;; |
3280 | |
3281 | -interix3*) |
3282 | - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here |
3283 | - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' |
3284 | - ;; |
3285 | - |
3286 | irix5* | irix6* | nonstopux*) |
3287 | case $LD in |
3288 | *-32|*"-32 ") libmagic=32-bit;; |
3289 | @@ -2369,7 +2690,7 @@ |
3290 | ;; |
3291 | |
3292 | # This must be Linux ELF. |
3293 | -linux* | k*bsd*-gnu) |
3294 | +linux*) |
3295 | lt_cv_deplibs_check_method=pass_all |
3296 | ;; |
3297 | |
3298 | @@ -2403,7 +2724,7 @@ |
3299 | lt_cv_deplibs_check_method=pass_all |
3300 | ;; |
3301 | |
3302 | -rdos*) |
3303 | +sco3.2v5*) |
3304 | lt_cv_deplibs_check_method=pass_all |
3305 | ;; |
3306 | |
3307 | @@ -2411,7 +2732,7 @@ |
3308 | lt_cv_deplibs_check_method=pass_all |
3309 | ;; |
3310 | |
3311 | -sysv4 | sysv4.3*) |
3312 | +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) |
3313 | case $host_vendor in |
3314 | motorola) |
3315 | lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' |
3316 | @@ -2432,13 +2753,10 @@ |
3317 | siemens) |
3318 | lt_cv_deplibs_check_method=pass_all |
3319 | ;; |
3320 | - pc) |
3321 | - lt_cv_deplibs_check_method=pass_all |
3322 | - ;; |
3323 | esac |
3324 | ;; |
3325 | |
3326 | -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) |
3327 | +sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*) |
3328 | lt_cv_deplibs_check_method=pass_all |
3329 | ;; |
3330 | esac |
3331 | @@ -2458,43 +2776,36 @@ |
3332 | # Let the user override the test. |
3333 | lt_cv_path_NM="$NM" |
3334 | else |
3335 | - lt_nm_to_check="${ac_tool_prefix}nm" |
3336 | - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then |
3337 | - lt_nm_to_check="$lt_nm_to_check nm" |
3338 | - fi |
3339 | - for lt_tmp_nm in $lt_nm_to_check; do |
3340 | - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
3341 | - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do |
3342 | - IFS="$lt_save_ifs" |
3343 | - test -z "$ac_dir" && ac_dir=. |
3344 | - tmp_nm="$ac_dir/$lt_tmp_nm" |
3345 | - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then |
3346 | - # Check to see if the nm accepts a BSD-compat flag. |
3347 | - # Adding the `sed 1q' prevents false positives on HP-UX, which says: |
3348 | - # nm: unknown option "B" ignored |
3349 | - # Tru64's nm complains that /dev/null is an invalid object file |
3350 | - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in |
3351 | - */dev/null* | *'Invalid file or object type'*) |
3352 | - lt_cv_path_NM="$tmp_nm -B" |
3353 | + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
3354 | + for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do |
3355 | + IFS="$lt_save_ifs" |
3356 | + test -z "$ac_dir" && ac_dir=. |
3357 | + tmp_nm="$ac_dir/${ac_tool_prefix}nm" |
3358 | + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then |
3359 | + # Check to see if the nm accepts a BSD-compat flag. |
3360 | + # Adding the `sed 1q' prevents false positives on HP-UX, which says: |
3361 | + # nm: unknown option "B" ignored |
3362 | + # Tru64's nm complains that /dev/null is an invalid object file |
3363 | + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in |
3364 | + */dev/null* | *'Invalid file or object type'*) |
3365 | + lt_cv_path_NM="$tmp_nm -B" |
3366 | + break |
3367 | + ;; |
3368 | + *) |
3369 | + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in |
3370 | + */dev/null*) |
3371 | + lt_cv_path_NM="$tmp_nm -p" |
3372 | break |
3373 | ;; |
3374 | *) |
3375 | - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in |
3376 | - */dev/null*) |
3377 | - lt_cv_path_NM="$tmp_nm -p" |
3378 | - break |
3379 | - ;; |
3380 | - *) |
3381 | - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but |
3382 | - continue # so that we can try to find one that supports BSD flags |
3383 | - ;; |
3384 | - esac |
3385 | + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but |
3386 | + continue # so that we can try to find one that supports BSD flags |
3387 | ;; |
3388 | esac |
3389 | - fi |
3390 | - done |
3391 | - IFS="$lt_save_ifs" |
3392 | + esac |
3393 | + fi |
3394 | done |
3395 | + IFS="$lt_save_ifs" |
3396 | test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm |
3397 | fi]) |
3398 | NM="$lt_cv_path_NM" |
3399 | @@ -2526,13 +2837,13 @@ |
3400 | # ----------------------------------- |
3401 | # sets LIBLTDL to the link flags for the libltdl convenience library and |
3402 | # LTDLINCL to the include flags for the libltdl header and adds |
3403 | -# --enable-ltdl-convenience to the configure arguments. Note that |
3404 | -# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, |
3405 | -# it is assumed to be `libltdl'. LIBLTDL will be prefixed with |
3406 | -# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' |
3407 | -# (note the single quotes!). If your package is not flat and you're not |
3408 | -# using automake, define top_builddir and top_srcdir appropriately in |
3409 | -# the Makefiles. |
3410 | +# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL |
3411 | +# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If |
3412 | +# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will |
3413 | +# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with |
3414 | +# '${top_srcdir}/' (note the single quotes!). If your package is not |
3415 | +# flat and you're not using automake, define top_builddir and |
3416 | +# top_srcdir appropriately in the Makefiles. |
3417 | AC_DEFUN([AC_LIBLTDL_CONVENIENCE], |
3418 | [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl |
3419 | case $enable_ltdl_convenience in |
3420 | @@ -2551,13 +2862,13 @@ |
3421 | # ----------------------------------- |
3422 | # sets LIBLTDL to the link flags for the libltdl installable library and |
3423 | # LTDLINCL to the include flags for the libltdl header and adds |
3424 | -# --enable-ltdl-install to the configure arguments. Note that |
3425 | -# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, |
3426 | -# and an installed libltdl is not found, it is assumed to be `libltdl'. |
3427 | -# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with |
3428 | -# '${top_srcdir}/' (note the single quotes!). If your package is not |
3429 | -# flat and you're not using automake, define top_builddir and top_srcdir |
3430 | -# appropriately in the Makefiles. |
3431 | +# --enable-ltdl-install to the configure arguments. Note that LIBLTDL |
3432 | +# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If |
3433 | +# DIRECTORY is not provided and an installed libltdl is not found, it is |
3434 | +# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/' |
3435 | +# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single |
3436 | +# quotes!). If your package is not flat and you're not using automake, |
3437 | +# define top_builddir and top_srcdir appropriately in the Makefiles. |
3438 | # In the future, this macro may have to be called after AC_PROG_LIBTOOL. |
3439 | AC_DEFUN([AC_LIBLTDL_INSTALLABLE], |
3440 | [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl |
3441 | @@ -2600,12 +2911,12 @@ |
3442 | ])# _LT_AC_LANG_CXX |
3443 | |
3444 | # _LT_AC_PROG_CXXCPP |
3445 | -# ------------------ |
3446 | +# --------------- |
3447 | AC_DEFUN([_LT_AC_PROG_CXXCPP], |
3448 | [ |
3449 | AC_REQUIRE([AC_PROG_CXX]) |
3450 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
3451 | - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
3452 | + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
3453 | (test "X$CXX" != "Xg++"))) ; then |
3454 | AC_PROG_CXXCPP |
3455 | fi |
3456 | @@ -2649,7 +2960,7 @@ |
3457 | |
3458 | |
3459 | # AC_LIBTOOL_RC |
3460 | -# ------------- |
3461 | +# -------------- |
3462 | # enable support for Windows resource files |
3463 | AC_DEFUN([AC_LIBTOOL_RC], |
3464 | [AC_REQUIRE([LT_AC_PROG_RC]) |
3465 | @@ -2675,16 +2986,43 @@ |
3466 | _LT_AC_TAGVAR(objext, $1)=$objext |
3467 | |
3468 | # Code to be used in simple compile tests |
3469 | -lt_simple_compile_test_code="int some_variable = 0;" |
3470 | +lt_simple_compile_test_code="int some_variable = 0;\n" |
3471 | |
3472 | # Code to be used in simple link tests |
3473 | -lt_simple_link_test_code='int main(){return(0);}' |
3474 | +lt_simple_link_test_code='int main(){return(0);}\n' |
3475 | |
3476 | _LT_AC_SYS_COMPILER |
3477 | |
3478 | -# save warnings/boilerplate of simple test code |
3479 | -_LT_COMPILER_BOILERPLATE |
3480 | -_LT_LINKER_BOILERPLATE |
3481 | +# |
3482 | +# Check for any special shared library compilation flags. |
3483 | +# |
3484 | +_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)= |
3485 | +if test "$GCC" = no; then |
3486 | + case $host_os in |
3487 | + sco3.2v5*) |
3488 | + _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf' |
3489 | + ;; |
3490 | + esac |
3491 | +fi |
3492 | +if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then |
3493 | + AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries]) |
3494 | + if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then : |
3495 | + else |
3496 | + AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure]) |
3497 | + _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no |
3498 | + fi |
3499 | +fi |
3500 | + |
3501 | + |
3502 | +# |
3503 | +# Check to make sure the static flag actually works. |
3504 | +# |
3505 | +AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works], |
3506 | + _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), |
3507 | + $_LT_AC_TAGVAR(lt_prog_compiler_static, $1), |
3508 | + [], |
3509 | + [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) |
3510 | + |
3511 | |
3512 | AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) |
3513 | AC_LIBTOOL_PROG_COMPILER_PIC($1) |
3514 | @@ -2694,9 +3032,9 @@ |
3515 | AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) |
3516 | AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) |
3517 | AC_LIBTOOL_SYS_LIB_STRIP |
3518 | -AC_LIBTOOL_DLOPEN_SELF |
3519 | +AC_LIBTOOL_DLOPEN_SELF($1) |
3520 | |
3521 | -# Report which library types will actually be built |
3522 | +# Report which librarie types wil actually be built |
3523 | AC_MSG_CHECKING([if libtool supports shared libraries]) |
3524 | AC_MSG_RESULT([$can_build_shared]) |
3525 | |
3526 | @@ -2705,7 +3043,7 @@ |
3527 | |
3528 | # On AIX, shared libraries and static libraries use the same namespace, and |
3529 | # are all built from PIC. |
3530 | -case $host_os in |
3531 | +case "$host_os" in |
3532 | aix3*) |
3533 | test "$enable_shared" = yes && enable_static=no |
3534 | if test -n "$RANLIB"; then |
3535 | @@ -2755,7 +3093,6 @@ |
3536 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
3537 | _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= |
3538 | _LT_AC_TAGVAR(hardcode_minus_L, $1)=no |
3539 | -_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
3540 | _LT_AC_TAGVAR(hardcode_automatic, $1)=no |
3541 | _LT_AC_TAGVAR(module_cmds, $1)= |
3542 | _LT_AC_TAGVAR(module_expsym_cmds, $1)= |
3543 | @@ -2773,25 +3110,21 @@ |
3544 | _LT_AC_TAGVAR(compiler_lib_search_path, $1)= |
3545 | |
3546 | # Source file extension for C++ test sources. |
3547 | -ac_ext=cpp |
3548 | +ac_ext=cc |
3549 | |
3550 | # Object file extension for compiled C++ test sources. |
3551 | objext=o |
3552 | _LT_AC_TAGVAR(objext, $1)=$objext |
3553 | |
3554 | # Code to be used in simple compile tests |
3555 | -lt_simple_compile_test_code="int some_variable = 0;" |
3556 | +lt_simple_compile_test_code="int some_variable = 0;\n" |
3557 | |
3558 | # Code to be used in simple link tests |
3559 | -lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' |
3560 | +lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' |
3561 | |
3562 | # ltmain only uses $CC for tagged configurations so make sure $CC is set. |
3563 | _LT_AC_SYS_COMPILER |
3564 | |
3565 | -# save warnings/boilerplate of simple test code |
3566 | -_LT_COMPILER_BOILERPLATE |
3567 | -_LT_LINKER_BOILERPLATE |
3568 | - |
3569 | # Allow CC to be a program name with arguments. |
3570 | lt_save_CC=$CC |
3571 | lt_save_LD=$LD |
3572 | @@ -2802,18 +3135,18 @@ |
3573 | if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then |
3574 | lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx |
3575 | else |
3576 | - $as_unset lt_cv_prog_gnu_ld |
3577 | + unset lt_cv_prog_gnu_ld |
3578 | fi |
3579 | if test -n "${lt_cv_path_LDCXX+set}"; then |
3580 | lt_cv_path_LD=$lt_cv_path_LDCXX |
3581 | else |
3582 | - $as_unset lt_cv_path_LD |
3583 | + unset lt_cv_path_LD |
3584 | fi |
3585 | test -z "${LDCXX+set}" || LD=$LDCXX |
3586 | CC=${CXX-"c++"} |
3587 | compiler=$CC |
3588 | _LT_AC_TAGVAR(compiler, $1)=$CC |
3589 | -_LT_CC_BASENAME([$compiler]) |
3590 | +cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` |
3591 | |
3592 | # We don't want -fno-exception wen compiling C++ code, so set the |
3593 | # no_builtin_flag separately |
3594 | @@ -2902,7 +3235,6 @@ |
3595 | ;; |
3596 | esac |
3597 | done |
3598 | - ;; |
3599 | esac |
3600 | |
3601 | exp_sym_flag='-bexport' |
3602 | @@ -2921,7 +3253,7 @@ |
3603 | _LT_AC_TAGVAR(link_all_deplibs, $1)=yes |
3604 | |
3605 | if test "$GXX" = yes; then |
3606 | - case $host_os in aix4.[[012]]|aix4.[[012]].*) |
3607 | + case $host_os in aix4.[012]|aix4.[012].*) |
3608 | # We only want to do this on AIX 4.2 and lower, the check |
3609 | # below for broken collect2 doesn't work under 4.3+ |
3610 | collect2name=`${CC} -print-prog-name=collect2` |
3611 | @@ -2929,7 +3261,7 @@ |
3612 | strings "$collect2name" | grep resolve_lib_name >/dev/null |
3613 | then |
3614 | # We have reworked collect2 |
3615 | - : |
3616 | + _LT_AC_TAGVAR(hardcode_direct, $1)=yes |
3617 | else |
3618 | # We have old collect2 |
3619 | _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported |
3620 | @@ -2940,12 +3272,8 @@ |
3621 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
3622 | _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= |
3623 | fi |
3624 | - ;; |
3625 | esac |
3626 | shared_flag='-shared' |
3627 | - if test "$aix_use_runtimelinking" = yes; then |
3628 | - shared_flag="$shared_flag "'${wl}-G' |
3629 | - fi |
3630 | else |
3631 | # not using gcc |
3632 | if test "$host_cpu" = ia64; then |
3633 | @@ -2972,12 +3300,12 @@ |
3634 | _LT_AC_SYS_LIBPATH_AIX |
3635 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
3636 | |
3637 | - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
3638 | + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
3639 | else |
3640 | if test "$host_cpu" = ia64; then |
3641 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' |
3642 | _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" |
3643 | - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" |
3644 | + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" |
3645 | else |
3646 | # Determine the default libpath from the value encoded in an empty executable. |
3647 | _LT_AC_SYS_LIBPATH_AIX |
3648 | @@ -2986,26 +3314,16 @@ |
3649 | # -berok will link without error, but may produce a broken library. |
3650 | _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' |
3651 | _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' |
3652 | + # -bexpall does not export symbols beginning with underscore (_) |
3653 | + _LT_AC_TAGVAR(always_export_symbols, $1)=yes |
3654 | # Exported symbols can be pulled into shared objects from archives |
3655 | - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
3656 | + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' |
3657 | _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes |
3658 | - # This is similar to how AIX traditionally builds its shared libraries. |
3659 | - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' |
3660 | + # This is similar to how AIX traditionally builds it's shared libraries. |
3661 | + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' |
3662 | fi |
3663 | fi |
3664 | ;; |
3665 | - |
3666 | - beos*) |
3667 | - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
3668 | - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported |
3669 | - # Joseph Beckenbach <jrb3@best.com> says some releases of gcc |
3670 | - # support --undefined. This deserves some investigation. FIXME |
3671 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3672 | - else |
3673 | - _LT_AC_TAGVAR(ld_shlibs, $1)=no |
3674 | - fi |
3675 | - ;; |
3676 | - |
3677 | chorus*) |
3678 | case $cc_basename in |
3679 | *) |
3680 | @@ -3015,6 +3333,7 @@ |
3681 | esac |
3682 | ;; |
3683 | |
3684 | + |
3685 | cygwin* | mingw* | pw32*) |
3686 | # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
3687 | # as there is no search path for DLLs. |
3688 | @@ -3024,7 +3343,7 @@ |
3689 | _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
3690 | |
3691 | if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then |
3692 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
3693 | + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' |
3694 | # If the export-symbols file already is a .def file (1st line |
3695 | # is EXPORTS), use it as is; otherwise, prepend... |
3696 | _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
3697 | @@ -3033,13 +3352,13 @@ |
3698 | echo EXPORTS > $output_objdir/$soname.def; |
3699 | cat $export_symbols >> $output_objdir/$soname.def; |
3700 | fi~ |
3701 | - $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' |
3702 | + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' |
3703 | else |
3704 | _LT_AC_TAGVAR(ld_shlibs, $1)=no |
3705 | fi |
3706 | ;; |
3707 | darwin* | rhapsody*) |
3708 | - case $host_os in |
3709 | + case "$host_os" in |
3710 | rhapsody* | darwin1.[[012]]) |
3711 | _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' |
3712 | ;; |
3713 | @@ -3077,7 +3396,7 @@ |
3714 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' |
3715 | fi |
3716 | _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
3717 | - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds |
3718 | + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's |
3719 | if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
3720 | _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
3721 | else |
3722 | @@ -3085,12 +3404,12 @@ |
3723 | fi |
3724 | _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
3725 | else |
3726 | - case $cc_basename in |
3727 | + case "$cc_basename" in |
3728 | xlc*) |
3729 | output_verbose_link_cmd='echo' |
3730 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' |
3731 | _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
3732 | - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds |
3733 | + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's |
3734 | _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
3735 | _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
3736 | ;; |
3737 | @@ -3103,11 +3422,11 @@ |
3738 | |
3739 | dgux*) |
3740 | case $cc_basename in |
3741 | - ec++*) |
3742 | + ec++) |
3743 | # FIXME: insert proper C++ library support |
3744 | _LT_AC_TAGVAR(ld_shlibs, $1)=no |
3745 | ;; |
3746 | - ghcx*) |
3747 | + ghcx) |
3748 | # Green Hills C++ Compiler |
3749 | # FIXME: insert proper C++ library support |
3750 | _LT_AC_TAGVAR(ld_shlibs, $1)=no |
3751 | @@ -3118,14 +3437,14 @@ |
3752 | ;; |
3753 | esac |
3754 | ;; |
3755 | - freebsd[[12]]*) |
3756 | + freebsd[12]*) |
3757 | # C++ shared libraries reported to be fairly broken before switch to ELF |
3758 | _LT_AC_TAGVAR(ld_shlibs, $1)=no |
3759 | ;; |
3760 | freebsd-elf*) |
3761 | _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
3762 | ;; |
3763 | - freebsd* | dragonfly*) |
3764 | + freebsd* | kfreebsd*-gnu) |
3765 | # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF |
3766 | # conventions |
3767 | _LT_AC_TAGVAR(ld_shlibs, $1)=yes |
3768 | @@ -3142,11 +3461,11 @@ |
3769 | # location of the library. |
3770 | |
3771 | case $cc_basename in |
3772 | - CC*) |
3773 | + CC) |
3774 | # FIXME: insert proper C++ library support |
3775 | _LT_AC_TAGVAR(ld_shlibs, $1)=no |
3776 | ;; |
3777 | - aCC*) |
3778 | + aCC) |
3779 | _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
3780 | # Commands to make compiler produce verbose output that lists |
3781 | # what "hidden" libraries, object files and flags are used when |
3782 | @@ -3156,7 +3475,7 @@ |
3783 | # explicitly linking system object files so we need to strip them |
3784 | # from the output so that they don't get included in the library |
3785 | # dependencies. |
3786 | - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' |
3787 | + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' |
3788 | ;; |
3789 | *) |
3790 | if test "$GXX" = yes; then |
3791 | @@ -3170,20 +3489,33 @@ |
3792 | ;; |
3793 | hpux10*|hpux11*) |
3794 | if test $with_gnu_ld = no; then |
3795 | - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
3796 | - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: |
3797 | - |
3798 | - case $host_cpu in |
3799 | - hppa*64*|ia64*) ;; |
3800 | + case "$host_cpu" in |
3801 | + hppa*64*) |
3802 | + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
3803 | + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' |
3804 | + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: |
3805 | + ;; |
3806 | + ia64*) |
3807 | + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
3808 | + ;; |
3809 | *) |
3810 | + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
3811 | + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: |
3812 | _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
3813 | ;; |
3814 | esac |
3815 | fi |
3816 | - case $host_cpu in |
3817 | - hppa*64*|ia64*) |
3818 | - _LT_AC_TAGVAR(hardcode_direct, $1)=no |
3819 | - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
3820 | + case "$host_cpu" in |
3821 | + hppa*64*) |
3822 | + _LT_AC_TAGVAR(hardcode_direct, $1)=no |
3823 | + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
3824 | + ;; |
3825 | + ia64*) |
3826 | + _LT_AC_TAGVAR(hardcode_direct, $1)=no |
3827 | + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
3828 | + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, |
3829 | + # but as the default |
3830 | + # location of the library. |
3831 | ;; |
3832 | *) |
3833 | _LT_AC_TAGVAR(hardcode_direct, $1)=yes |
3834 | @@ -3194,17 +3526,14 @@ |
3835 | esac |
3836 | |
3837 | case $cc_basename in |
3838 | - CC*) |
3839 | + CC) |
3840 | # FIXME: insert proper C++ library support |
3841 | _LT_AC_TAGVAR(ld_shlibs, $1)=no |
3842 | ;; |
3843 | - aCC*) |
3844 | - case $host_cpu in |
3845 | - hppa*64*) |
3846 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
3847 | - ;; |
3848 | - ia64*) |
3849 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
3850 | + aCC) |
3851 | + case "$host_cpu" in |
3852 | + hppa*64*|ia64*) |
3853 | + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' |
3854 | ;; |
3855 | *) |
3856 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
3857 | @@ -3223,12 +3552,9 @@ |
3858 | *) |
3859 | if test "$GXX" = yes; then |
3860 | if test $with_gnu_ld = no; then |
3861 | - case $host_cpu in |
3862 | - hppa*64*) |
3863 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
3864 | - ;; |
3865 | - ia64*) |
3866 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
3867 | + case "$host_cpu" in |
3868 | + ia64*|hppa*64*) |
3869 | + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' |
3870 | ;; |
3871 | *) |
3872 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
3873 | @@ -3242,25 +3568,11 @@ |
3874 | ;; |
3875 | esac |
3876 | ;; |
3877 | - interix3*) |
3878 | - _LT_AC_TAGVAR(hardcode_direct, $1)=no |
3879 | - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
3880 | - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
3881 | - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
3882 | - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. |
3883 | - # Instead, shared libraries are loaded at an image base (0x10000000 by |
3884 | - # default) and relocated if they conflict, which is a slow very memory |
3885 | - # consuming and fragmenting process. To avoid this, we pick a random, |
3886 | - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link |
3887 | - # time. Moving up from 0x10000000 also allows more sbrk(2) space. |
3888 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
3889 | - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
3890 | - ;; |
3891 | irix5* | irix6*) |
3892 | case $cc_basename in |
3893 | - CC*) |
3894 | + CC) |
3895 | # SGI C++ |
3896 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' |
3897 | + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' |
3898 | |
3899 | # Archives containing C++ object files must be created using |
3900 | # "CC -ar", where "CC" is the IRIX C++ compiler. This is |
3901 | @@ -3271,7 +3583,7 @@ |
3902 | *) |
3903 | if test "$GXX" = yes; then |
3904 | if test "$with_gnu_ld" = no; then |
3905 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
3906 | + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' |
3907 | else |
3908 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' |
3909 | fi |
3910 | @@ -3282,9 +3594,9 @@ |
3911 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
3912 | _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: |
3913 | ;; |
3914 | - linux* | k*bsd*-gnu) |
3915 | + linux*) |
3916 | case $cc_basename in |
3917 | - KCC*) |
3918 | + KCC) |
3919 | # Kuck and Associates, Inc. (KAI) C++ Compiler |
3920 | |
3921 | # KCC will only create a shared library if the output file |
3922 | @@ -3309,7 +3621,7 @@ |
3923 | # "CC -Bstatic", where "CC" is the KAI C++ compiler. |
3924 | _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' |
3925 | ;; |
3926 | - icpc*) |
3927 | + icpc) |
3928 | # Intel C++ |
3929 | with_gnu_ld=yes |
3930 | # version 8.0 and above of icpc choke on multiply defined symbols |
3931 | @@ -3321,12 +3633,8 @@ |
3932 | _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
3933 | ;; |
3934 | *) # Version 8.0 or newer |
3935 | - tmp_idyn= |
3936 | - case $host_cpu in |
3937 | - ia64*) tmp_idyn=' -i_dynamic';; |
3938 | - esac |
3939 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3940 | - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
3941 | + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3942 | + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
3943 | ;; |
3944 | esac |
3945 | _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
3946 | @@ -3334,16 +3642,7 @@ |
3947 | _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
3948 | _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' |
3949 | ;; |
3950 | - pgCC*) |
3951 | - # Portland Group C++ compiler |
3952 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
3953 | - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
3954 | - |
3955 | - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' |
3956 | - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
3957 | - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' |
3958 | - ;; |
3959 | - cxx*) |
3960 | + cxx) |
3961 | # Compaq C++ |
3962 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3963 | _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' |
3964 | @@ -3362,29 +3661,6 @@ |
3965 | # dependencies. |
3966 | output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' |
3967 | ;; |
3968 | - *) |
3969 | - case `$CC -V 2>&1 | sed 5q` in |
3970 | - *Sun\ C*) |
3971 | - # Sun C++ 5.9 |
3972 | - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' |
3973 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
3974 | - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' |
3975 | - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
3976 | - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' |
3977 | - |
3978 | - # Not sure whether something based on |
3979 | - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 |
3980 | - # would be better. |
3981 | - output_verbose_link_cmd='echo' |
3982 | - |
3983 | - # Archives containing C++ object files must be created using |
3984 | - # "CC -xar", where "CC" is the Sun C++ compiler. This is |
3985 | - # necessary to make sure instantiated templates are included |
3986 | - # in the archive. |
3987 | - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' |
3988 | - ;; |
3989 | - esac |
3990 | - ;; |
3991 | esac |
3992 | ;; |
3993 | lynxos*) |
3994 | @@ -3397,7 +3673,7 @@ |
3995 | ;; |
3996 | mvs*) |
3997 | case $cc_basename in |
3998 | - cxx*) |
3999 | + cxx) |
4000 | # FIXME: insert proper C++ library support |
4001 | _LT_AC_TAGVAR(ld_shlibs, $1)=no |
4002 | ;; |
4003 | @@ -3436,7 +3712,7 @@ |
4004 | ;; |
4005 | osf3*) |
4006 | case $cc_basename in |
4007 | - KCC*) |
4008 | + KCC) |
4009 | # Kuck and Associates, Inc. (KAI) C++ Compiler |
4010 | |
4011 | # KCC will only create a shared library if the output file |
4012 | @@ -3452,14 +3728,14 @@ |
4013 | _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' |
4014 | |
4015 | ;; |
4016 | - RCC*) |
4017 | + RCC) |
4018 | # Rational C++ 2.4.1 |
4019 | # FIXME: insert proper C++ library support |
4020 | _LT_AC_TAGVAR(ld_shlibs, $1)=no |
4021 | ;; |
4022 | - cxx*) |
4023 | + cxx) |
4024 | _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
4025 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' |
4026 | + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' |
4027 | |
4028 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
4029 | _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: |
4030 | @@ -3477,7 +3753,7 @@ |
4031 | *) |
4032 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
4033 | _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
4034 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4035 | + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' |
4036 | |
4037 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
4038 | _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: |
4039 | @@ -3496,7 +3772,7 @@ |
4040 | ;; |
4041 | osf4* | osf5*) |
4042 | case $cc_basename in |
4043 | - KCC*) |
4044 | + KCC) |
4045 | # Kuck and Associates, Inc. (KAI) C++ Compiler |
4046 | |
4047 | # KCC will only create a shared library if the output file |
4048 | @@ -3511,17 +3787,17 @@ |
4049 | # the KAI C++ compiler. |
4050 | _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' |
4051 | ;; |
4052 | - RCC*) |
4053 | + RCC) |
4054 | # Rational C++ 2.4.1 |
4055 | # FIXME: insert proper C++ library support |
4056 | _LT_AC_TAGVAR(ld_shlibs, $1)=no |
4057 | ;; |
4058 | - cxx*) |
4059 | + cxx) |
4060 | _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
4061 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' |
4062 | + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' |
4063 | _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ |
4064 | echo "-hidden">> $lib.exp~ |
4065 | - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ |
4066 | + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ |
4067 | $rm $lib.exp' |
4068 | |
4069 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' |
4070 | @@ -3540,7 +3816,7 @@ |
4071 | *) |
4072 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
4073 | _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
4074 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4075 | + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' |
4076 | |
4077 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
4078 | _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: |
4079 | @@ -3561,14 +3837,27 @@ |
4080 | # FIXME: insert proper C++ library support |
4081 | _LT_AC_TAGVAR(ld_shlibs, $1)=no |
4082 | ;; |
4083 | + sco*) |
4084 | + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
4085 | + case $cc_basename in |
4086 | + CC) |
4087 | + # FIXME: insert proper C++ library support |
4088 | + _LT_AC_TAGVAR(ld_shlibs, $1)=no |
4089 | + ;; |
4090 | + *) |
4091 | + # FIXME: insert proper C++ library support |
4092 | + _LT_AC_TAGVAR(ld_shlibs, $1)=no |
4093 | + ;; |
4094 | + esac |
4095 | + ;; |
4096 | sunos4*) |
4097 | case $cc_basename in |
4098 | - CC*) |
4099 | + CC) |
4100 | # Sun C++ 4.x |
4101 | # FIXME: insert proper C++ library support |
4102 | _LT_AC_TAGVAR(ld_shlibs, $1)=no |
4103 | ;; |
4104 | - lcc*) |
4105 | + lcc) |
4106 | # Lucid |
4107 | # FIXME: insert proper C++ library support |
4108 | _LT_AC_TAGVAR(ld_shlibs, $1)=no |
4109 | @@ -3581,28 +3870,36 @@ |
4110 | ;; |
4111 | solaris*) |
4112 | case $cc_basename in |
4113 | - CC*) |
4114 | + CC) |
4115 | # Sun C++ 4.2, 5.x and Centerline C++ |
4116 | - _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes |
4117 | _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' |
4118 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
4119 | + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
4120 | _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ |
4121 | - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' |
4122 | + $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' |
4123 | |
4124 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
4125 | _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
4126 | case $host_os in |
4127 | - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; |
4128 | + solaris2.[0-5] | solaris2.[0-5].*) ;; |
4129 | *) |
4130 | - # The compiler driver will combine and reorder linker options, |
4131 | - # but understands `-z linker_flag'. |
4132 | + # The C++ compiler is used as linker so we must use $wl |
4133 | + # flag to pass the commands to the underlying system |
4134 | + # linker. |
4135 | # Supported since Solaris 2.6 (maybe 2.5.1?) |
4136 | - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' |
4137 | + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' |
4138 | ;; |
4139 | esac |
4140 | _LT_AC_TAGVAR(link_all_deplibs, $1)=yes |
4141 | |
4142 | - output_verbose_link_cmd='echo' |
4143 | + # Commands to make compiler produce verbose output that lists |
4144 | + # what "hidden" libraries, object files and flags are used when |
4145 | + # linking a shared library. |
4146 | + # |
4147 | + # There doesn't appear to be a way to prevent this compiler from |
4148 | + # explicitly linking system object files so we need to strip them |
4149 | + # from the output so that they don't get included in the library |
4150 | + # dependencies. |
4151 | + output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' |
4152 | |
4153 | # Archives containing C++ object files must be created using |
4154 | # "CC -xar", where "CC" is the Sun C++ compiler. This is |
4155 | @@ -3610,7 +3907,7 @@ |
4156 | # in the archive. |
4157 | _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' |
4158 | ;; |
4159 | - gcx*) |
4160 | + gcx) |
4161 | # Green Hills C++ Compiler |
4162 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
4163 | |
4164 | @@ -3644,73 +3941,16 @@ |
4165 | fi |
4166 | |
4167 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' |
4168 | - case $host_os in |
4169 | - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; |
4170 | - *) |
4171 | - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' |
4172 | - ;; |
4173 | - esac |
4174 | fi |
4175 | ;; |
4176 | esac |
4177 | ;; |
4178 | - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) |
4179 | - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' |
4180 | - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
4181 | - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
4182 | - runpath_var='LD_RUN_PATH' |
4183 | - |
4184 | - case $cc_basename in |
4185 | - CC*) |
4186 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
4187 | - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
4188 | - ;; |
4189 | - *) |
4190 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
4191 | - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
4192 | - ;; |
4193 | - esac |
4194 | - ;; |
4195 | - sysv5* | sco3.2v5* | sco5v6*) |
4196 | - # Note: We can NOT use -z defs as we might desire, because we do not |
4197 | - # link with -lc, and that would cause any symbols used from libc to |
4198 | - # always be unresolved, which means just about no library would |
4199 | - # ever link correctly. If we're not using GNU ld we use -z text |
4200 | - # though, which does catch some bad symbols but isn't as heavy-handed |
4201 | - # as -z defs. |
4202 | - # For security reasons, it is highly recommended that you always |
4203 | - # use absolute paths for naming shared libraries, and exclude the |
4204 | - # DT_RUNPATH tag from executables and libraries. But doing so |
4205 | - # requires that you compile everything twice, which is a pain. |
4206 | - # So that behaviour is only enabled if SCOABSPATH is set to a |
4207 | - # non-empty value in the environment. Most likely only useful for |
4208 | - # creating official distributions of packages. |
4209 | - # This is a hack until libtool officially supports absolute path |
4210 | - # names for shared libraries. |
4211 | - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' |
4212 | - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' |
4213 | - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
4214 | - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
4215 | - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' |
4216 | - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' |
4217 | - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes |
4218 | - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' |
4219 | - runpath_var='LD_RUN_PATH' |
4220 | - |
4221 | - case $cc_basename in |
4222 | - CC*) |
4223 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
4224 | - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
4225 | - ;; |
4226 | - *) |
4227 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
4228 | - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
4229 | - ;; |
4230 | - esac |
4231 | + sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) |
4232 | + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
4233 | ;; |
4234 | tandem*) |
4235 | case $cc_basename in |
4236 | - NCC*) |
4237 | + NCC) |
4238 | # NonStop-UX NCC 3.20 |
4239 | # FIXME: insert proper C++ library support |
4240 | _LT_AC_TAGVAR(ld_shlibs, $1)=no |
4241 | @@ -3743,6 +3983,8 @@ |
4242 | AC_LIBTOOL_PROG_LD_SHLIBS($1) |
4243 | AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) |
4244 | AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) |
4245 | +AC_LIBTOOL_SYS_LIB_STRIP |
4246 | +AC_LIBTOOL_DLOPEN_SELF($1) |
4247 | |
4248 | AC_LIBTOOL_CONFIG($1) |
4249 | |
4250 | @@ -3760,7 +4002,7 @@ |
4251 | ])# AC_LIBTOOL_LANG_CXX_CONFIG |
4252 | |
4253 | # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) |
4254 | -# ------------------------------------ |
4255 | +# ------------------------ |
4256 | # Figure out "hidden" library dependencies from verbose |
4257 | # compiler output when linking a shared library. |
4258 | # Parse the compiler output and extract the necessary |
4259 | @@ -3814,7 +4056,7 @@ |
4260 | # The `*' in the case matches for architectures that use `case' in |
4261 | # $output_verbose_cmd can trigger glob expansion during the loop |
4262 | # eval without this substitution. |
4263 | - output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` |
4264 | + output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" |
4265 | |
4266 | for p in `eval $output_verbose_link_cmd`; do |
4267 | case $p in |
4268 | @@ -3890,70 +4132,13 @@ |
4269 | |
4270 | $rm -f confest.$objext |
4271 | |
4272 | -# PORTME: override above test on systems where it is broken |
4273 | -ifelse([$1],[CXX], |
4274 | -[case $host_os in |
4275 | -interix3*) |
4276 | - # Interix 3.5 installs completely hosed .la files for C++, so rather than |
4277 | - # hack all around it, let's just trust "g++" to DTRT. |
4278 | - _LT_AC_TAGVAR(predep_objects,$1)= |
4279 | - _LT_AC_TAGVAR(postdep_objects,$1)= |
4280 | - _LT_AC_TAGVAR(postdeps,$1)= |
4281 | - ;; |
4282 | - |
4283 | -linux*) |
4284 | - case `$CC -V 2>&1 | sed 5q` in |
4285 | - *Sun\ C*) |
4286 | - # Sun C++ 5.9 |
4287 | - # |
4288 | - # The more standards-conforming stlport4 library is |
4289 | - # incompatible with the Cstd library. Avoid specifying |
4290 | - # it if it's in CXXFLAGS. Ignore libCrun as |
4291 | - # -library=stlport4 depends on it. |
4292 | - case " $CXX $CXXFLAGS " in |
4293 | - *" -library=stlport4 "*) |
4294 | - solaris_use_stlport4=yes |
4295 | - ;; |
4296 | - esac |
4297 | - if test "$solaris_use_stlport4" != yes; then |
4298 | - _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' |
4299 | - fi |
4300 | - ;; |
4301 | - esac |
4302 | - ;; |
4303 | - |
4304 | -solaris*) |
4305 | - case $cc_basename in |
4306 | - CC*) |
4307 | - # The more standards-conforming stlport4 library is |
4308 | - # incompatible with the Cstd library. Avoid specifying |
4309 | - # it if it's in CXXFLAGS. Ignore libCrun as |
4310 | - # -library=stlport4 depends on it. |
4311 | - case " $CXX $CXXFLAGS " in |
4312 | - *" -library=stlport4 "*) |
4313 | - solaris_use_stlport4=yes |
4314 | - ;; |
4315 | - esac |
4316 | - |
4317 | - # Adding this requires a known-good setup of shared libraries for |
4318 | - # Sun compiler versions before 5.6, else PIC objects from an old |
4319 | - # archive will be linked into the output, leading to subtle bugs. |
4320 | - if test "$solaris_use_stlport4" != yes; then |
4321 | - _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' |
4322 | - fi |
4323 | - ;; |
4324 | - esac |
4325 | - ;; |
4326 | -esac |
4327 | -]) |
4328 | - |
4329 | case " $_LT_AC_TAGVAR(postdeps, $1) " in |
4330 | *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; |
4331 | esac |
4332 | ])# AC_LIBTOOL_POSTDEP_PREDEP |
4333 | |
4334 | # AC_LIBTOOL_LANG_F77_CONFIG |
4335 | -# -------------------------- |
4336 | +# ------------------------ |
4337 | # Ensure that the configuration vars for the C compiler are |
4338 | # suitably defined. Those variables are subsequently used by |
4339 | # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. |
4340 | @@ -3989,31 +4174,20 @@ |
4341 | _LT_AC_TAGVAR(objext, $1)=$objext |
4342 | |
4343 | # Code to be used in simple compile tests |
4344 | -lt_simple_compile_test_code="\ |
4345 | - subroutine t |
4346 | - return |
4347 | - end |
4348 | -" |
4349 | +lt_simple_compile_test_code=" subroutine t\n return\n end\n" |
4350 | |
4351 | # Code to be used in simple link tests |
4352 | -lt_simple_link_test_code="\ |
4353 | - program t |
4354 | - end |
4355 | -" |
4356 | +lt_simple_link_test_code=" program t\n end\n" |
4357 | |
4358 | # ltmain only uses $CC for tagged configurations so make sure $CC is set. |
4359 | _LT_AC_SYS_COMPILER |
4360 | |
4361 | -# save warnings/boilerplate of simple test code |
4362 | -_LT_COMPILER_BOILERPLATE |
4363 | -_LT_LINKER_BOILERPLATE |
4364 | - |
4365 | # Allow CC to be a program name with arguments. |
4366 | lt_save_CC="$CC" |
4367 | CC=${F77-"f77"} |
4368 | compiler=$CC |
4369 | _LT_AC_TAGVAR(compiler, $1)=$CC |
4370 | -_LT_CC_BASENAME([$compiler]) |
4371 | +cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` |
4372 | |
4373 | AC_MSG_CHECKING([if libtool supports shared libraries]) |
4374 | AC_MSG_RESULT([$can_build_shared]) |
4375 | @@ -4023,7 +4197,7 @@ |
4376 | |
4377 | # On AIX, shared libraries and static libraries use the same namespace, and |
4378 | # are all built from PIC. |
4379 | -case $host_os in |
4380 | +case "$host_os" in |
4381 | aix3*) |
4382 | test "$enable_shared" = yes && enable_static=no |
4383 | if test -n "$RANLIB"; then |
4384 | @@ -4032,9 +4206,7 @@ |
4385 | fi |
4386 | ;; |
4387 | aix4* | aix5*) |
4388 | - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then |
4389 | - test "$enable_shared" = yes && enable_static=no |
4390 | - fi |
4391 | + test "$enable_shared" = yes && enable_static=no |
4392 | ;; |
4393 | esac |
4394 | AC_MSG_RESULT([$enable_shared]) |
4395 | @@ -4044,6 +4216,8 @@ |
4396 | test "$enable_shared" = yes || enable_static=yes |
4397 | AC_MSG_RESULT([$enable_static]) |
4398 | |
4399 | +test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no |
4400 | + |
4401 | _LT_AC_TAGVAR(GCC, $1)="$G77" |
4402 | _LT_AC_TAGVAR(LD, $1)="$LD" |
4403 | |
4404 | @@ -4053,6 +4227,8 @@ |
4405 | AC_LIBTOOL_PROG_LD_SHLIBS($1) |
4406 | AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) |
4407 | AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) |
4408 | +AC_LIBTOOL_SYS_LIB_STRIP |
4409 | + |
4410 | |
4411 | AC_LIBTOOL_CONFIG($1) |
4412 | |
4413 | @@ -4078,30 +4254,23 @@ |
4414 | _LT_AC_TAGVAR(objext, $1)=$objext |
4415 | |
4416 | # Code to be used in simple compile tests |
4417 | -lt_simple_compile_test_code="class foo {}" |
4418 | +lt_simple_compile_test_code="class foo {}\n" |
4419 | |
4420 | # Code to be used in simple link tests |
4421 | -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' |
4422 | +lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' |
4423 | |
4424 | # ltmain only uses $CC for tagged configurations so make sure $CC is set. |
4425 | _LT_AC_SYS_COMPILER |
4426 | |
4427 | -# save warnings/boilerplate of simple test code |
4428 | -_LT_COMPILER_BOILERPLATE |
4429 | -_LT_LINKER_BOILERPLATE |
4430 | - |
4431 | # Allow CC to be a program name with arguments. |
4432 | lt_save_CC="$CC" |
4433 | CC=${GCJ-"gcj"} |
4434 | compiler=$CC |
4435 | _LT_AC_TAGVAR(compiler, $1)=$CC |
4436 | -_LT_CC_BASENAME([$compiler]) |
4437 | |
4438 | # GCJ did not exist at the time GCC didn't implicitly link libc in. |
4439 | _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
4440 | |
4441 | -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
4442 | - |
4443 | AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) |
4444 | AC_LIBTOOL_PROG_COMPILER_PIC($1) |
4445 | AC_LIBTOOL_PROG_CC_C_O($1) |
4446 | @@ -4109,6 +4278,8 @@ |
4447 | AC_LIBTOOL_PROG_LD_SHLIBS($1) |
4448 | AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) |
4449 | AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) |
4450 | +AC_LIBTOOL_SYS_LIB_STRIP |
4451 | +AC_LIBTOOL_DLOPEN_SELF($1) |
4452 | |
4453 | AC_LIBTOOL_CONFIG($1) |
4454 | |
4455 | @@ -4118,7 +4289,7 @@ |
4456 | |
4457 | |
4458 | # AC_LIBTOOL_LANG_RC_CONFIG |
4459 | -# ------------------------- |
4460 | +# -------------------------- |
4461 | # Ensure that the configuration vars for the Windows resource compiler are |
4462 | # suitably defined. Those variables are subsequently used by |
4463 | # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. |
4464 | @@ -4134,7 +4305,7 @@ |
4465 | _LT_AC_TAGVAR(objext, $1)=$objext |
4466 | |
4467 | # Code to be used in simple compile tests |
4468 | -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' |
4469 | +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' |
4470 | |
4471 | # Code to be used in simple link tests |
4472 | lt_simple_link_test_code="$lt_simple_compile_test_code" |
4473 | @@ -4142,16 +4313,11 @@ |
4474 | # ltmain only uses $CC for tagged configurations so make sure $CC is set. |
4475 | _LT_AC_SYS_COMPILER |
4476 | |
4477 | -# save warnings/boilerplate of simple test code |
4478 | -_LT_COMPILER_BOILERPLATE |
4479 | -_LT_LINKER_BOILERPLATE |
4480 | - |
4481 | # Allow CC to be a program name with arguments. |
4482 | lt_save_CC="$CC" |
4483 | CC=${RC-"windres"} |
4484 | compiler=$CC |
4485 | _LT_AC_TAGVAR(compiler, $1)=$CC |
4486 | -_LT_CC_BASENAME([$compiler]) |
4487 | _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes |
4488 | |
4489 | AC_LIBTOOL_CONFIG($1) |
4490 | @@ -4181,7 +4347,7 @@ |
4491 | # Now quote all the things that may contain metacharacters while being |
4492 | # careful not to overquote the AC_SUBSTed values. We take copies of the |
4493 | # variables and quote the copies for generation of the libtool script. |
4494 | - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ |
4495 | + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ |
4496 | SED SHELL STRIP \ |
4497 | libname_spec library_names_spec soname_spec extract_expsyms_cmds \ |
4498 | old_striplib striplib file_magic_cmd finish_cmds finish_eval \ |
4499 | @@ -4269,7 +4435,7 @@ |
4500 | # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) |
4501 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
4502 | # |
4503 | -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 |
4504 | +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 |
4505 | # Free Software Foundation, Inc. |
4506 | # |
4507 | # This file is part of GNU Libtool: |
4508 | @@ -4287,7 +4453,7 @@ |
4509 | # |
4510 | # You should have received a copy of the GNU General Public License |
4511 | # along with this program; if not, write to the Free Software |
4512 | -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
4513 | +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
4514 | # |
4515 | # As a special exception to the GNU General Public License, if you |
4516 | # distribute this file as part of a program that contains a |
4517 | @@ -4298,7 +4464,7 @@ |
4518 | SED=$lt_SED |
4519 | |
4520 | # Sed that helps us avoid accidentally triggering echo(1) options like -n. |
4521 | -Xsed="$SED -e 1s/^X//" |
4522 | +Xsed="$SED -e s/^X//" |
4523 | |
4524 | # The HP-UX ksh and POSIX shell print the target directory to stdout |
4525 | # if CDPATH is set. |
4526 | @@ -4333,12 +4499,6 @@ |
4527 | # The host system. |
4528 | host_alias=$host_alias |
4529 | host=$host |
4530 | -host_os=$host_os |
4531 | - |
4532 | -# The build system. |
4533 | -build_alias=$build_alias |
4534 | -build=$build |
4535 | -build_os=$build_os |
4536 | |
4537 | # An echo program that does not interpret backslashes. |
4538 | echo=$lt_echo |
4539 | @@ -4350,9 +4510,6 @@ |
4540 | # A C compiler. |
4541 | LTCC=$lt_LTCC |
4542 | |
4543 | -# LTCC compiler flags. |
4544 | -LTCFLAGS=$lt_LTCFLAGS |
4545 | - |
4546 | # A language-specific compiler. |
4547 | CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) |
4548 | |
4549 | @@ -4418,7 +4575,7 @@ |
4550 | # Does compiler simultaneously support -c and -o options? |
4551 | compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) |
4552 | |
4553 | -# Must we lock files when doing compilation? |
4554 | +# Must we lock files when doing compilation ? |
4555 | need_locks=$lt_need_locks |
4556 | |
4557 | # Do we need the lib prefix for modules? |
4558 | @@ -4692,6 +4849,9 @@ |
4559 | # Regexp to match symbols that can be accessed directly from C. |
4560 | sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' |
4561 | |
4562 | +# Transform the above into a raw symbol and a C symbol. |
4563 | +symxfrm='\1 \2\3 \3' |
4564 | + |
4565 | # Transform an extracted symbol line into a proper C declaration |
4566 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" |
4567 | |
4568 | @@ -4713,7 +4873,7 @@ |
4569 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
4570 | lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" |
4571 | ;; |
4572 | -linux* | k*bsd*-gnu) |
4573 | +linux*) |
4574 | if test "$host_cpu" = ia64; then |
4575 | symcode='[[ABCDGIRSTW]]' |
4576 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
4577 | @@ -4726,18 +4886,9 @@ |
4578 | osf*) |
4579 | symcode='[[BCDEGQRST]]' |
4580 | ;; |
4581 | -solaris*) |
4582 | +solaris* | sysv5*) |
4583 | symcode='[[BDRT]]' |
4584 | ;; |
4585 | -sco3.2v5*) |
4586 | - symcode='[[DT]]' |
4587 | - ;; |
4588 | -sysv4.2uw2*) |
4589 | - symcode='[[DT]]' |
4590 | - ;; |
4591 | -sysv5* | sco5v6* | unixware* | OpenUNIX*) |
4592 | - symcode='[[ABDT]]' |
4593 | - ;; |
4594 | sysv4) |
4595 | symcode='[[DFNSTU]]' |
4596 | ;; |
4597 | @@ -4760,11 +4911,8 @@ |
4598 | # Try without a prefix undercore, then with it. |
4599 | for ac_symprfx in "" "_"; do |
4600 | |
4601 | - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. |
4602 | - symxfrm="\\1 $ac_symprfx\\2 \\2" |
4603 | - |
4604 | # Write the raw and C identifiers. |
4605 | - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
4606 | + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" |
4607 | |
4608 | # Check to see that the pipe works correctly. |
4609 | pipe_works=no |
4610 | @@ -4903,14 +5051,12 @@ |
4611 | # like `-m68040'. |
4612 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' |
4613 | ;; |
4614 | - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) |
4615 | + beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) |
4616 | # PIC is the default for these OSes. |
4617 | ;; |
4618 | - mingw* | cygwin* | os2* | pw32*) |
4619 | + mingw* | os2* | pw32*) |
4620 | # This hack is so that the source file can tell whether it is being |
4621 | # built for inclusion in a dll (and should export symbols for example). |
4622 | - # Although the cygwin gcc ignores -fPIC, still need this for old-style |
4623 | - # (--disable-auto-import) libraries |
4624 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' |
4625 | ;; |
4626 | darwin* | rhapsody*) |
4627 | @@ -4922,10 +5068,6 @@ |
4628 | # DJGPP does not support shared libraries at all |
4629 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= |
4630 | ;; |
4631 | - interix3*) |
4632 | - # Interix 3.x gcc -fpic/-fPIC options generate broken code. |
4633 | - # Instead, we relocate shared libraries at runtime. |
4634 | - ;; |
4635 | sysv4*MP*) |
4636 | if test -d /usr/nec; then |
4637 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic |
4638 | @@ -4934,7 +5076,7 @@ |
4639 | hpux*) |
4640 | # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but |
4641 | # not for PA HP-UX. |
4642 | - case $host_cpu in |
4643 | + case "$host_cpu" in |
4644 | hppa*64*|ia64*) |
4645 | ;; |
4646 | *) |
4647 | @@ -4959,7 +5101,7 @@ |
4648 | ;; |
4649 | chorus*) |
4650 | case $cc_basename in |
4651 | - cxch68*) |
4652 | + cxch68) |
4653 | # Green Hills C++ Compiler |
4654 | # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" |
4655 | ;; |
4656 | @@ -4968,7 +5110,7 @@ |
4657 | darwin*) |
4658 | # PIC is the default on this platform |
4659 | # Common symbols not allowed in MH_DYLIB files |
4660 | - case $cc_basename in |
4661 | + case "$cc_basename" in |
4662 | xlc*) |
4663 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' |
4664 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4665 | @@ -4977,10 +5119,10 @@ |
4666 | ;; |
4667 | dgux*) |
4668 | case $cc_basename in |
4669 | - ec++*) |
4670 | + ec++) |
4671 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
4672 | ;; |
4673 | - ghcx*) |
4674 | + ghcx) |
4675 | # Green Hills C++ Compiler |
4676 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' |
4677 | ;; |
4678 | @@ -4988,22 +5130,22 @@ |
4679 | ;; |
4680 | esac |
4681 | ;; |
4682 | - freebsd* | dragonfly*) |
4683 | + freebsd* | kfreebsd*-gnu) |
4684 | # FreeBSD uses GNU C++ |
4685 | ;; |
4686 | hpux9* | hpux10* | hpux11*) |
4687 | case $cc_basename in |
4688 | - CC*) |
4689 | + CC) |
4690 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4691 | - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' |
4692 | + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" |
4693 | if test "$host_cpu" != ia64; then |
4694 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' |
4695 | fi |
4696 | ;; |
4697 | - aCC*) |
4698 | + aCC) |
4699 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4700 | - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' |
4701 | - case $host_cpu in |
4702 | + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" |
4703 | + case "$host_cpu" in |
4704 | hppa*64*|ia64*) |
4705 | # +Z the default |
4706 | ;; |
4707 | @@ -5016,13 +5158,9 @@ |
4708 | ;; |
4709 | esac |
4710 | ;; |
4711 | - interix*) |
4712 | - # This is c89, which is MS Visual C++ (no shared libs) |
4713 | - # Anyone wants to do a port? |
4714 | - ;; |
4715 | irix5* | irix6* | nonstopux*) |
4716 | case $cc_basename in |
4717 | - CC*) |
4718 | + CC) |
4719 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4720 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
4721 | # CC pic flag -KPIC is the default. |
4722 | @@ -5031,26 +5169,20 @@ |
4723 | ;; |
4724 | esac |
4725 | ;; |
4726 | - linux* | k*bsd*-gnu) |
4727 | + linux*) |
4728 | case $cc_basename in |
4729 | - KCC*) |
4730 | + KCC) |
4731 | # KAI C++ Compiler |
4732 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' |
4733 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
4734 | ;; |
4735 | - icpc* | ecpc*) |
4736 | + icpc) |
4737 | # Intel C++ |
4738 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4739 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
4740 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' |
4741 | ;; |
4742 | - pgCC*) |
4743 | - # Portland Group C++ compiler. |
4744 | - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4745 | - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' |
4746 | - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
4747 | - ;; |
4748 | - cxx*) |
4749 | + cxx) |
4750 | # Compaq C++ |
4751 | # Make sure the PIC flag is empty. It appears that all Alpha |
4752 | # Linux and Compaq Tru64 Unix objects are PIC. |
4753 | @@ -5058,14 +5190,6 @@ |
4754 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
4755 | ;; |
4756 | *) |
4757 | - case `$CC -V 2>&1 | sed 5q` in |
4758 | - *Sun\ C*) |
4759 | - # Sun C++ 5.9 |
4760 | - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
4761 | - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
4762 | - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' |
4763 | - ;; |
4764 | - esac |
4765 | ;; |
4766 | esac |
4767 | ;; |
4768 | @@ -5075,7 +5199,7 @@ |
4769 | ;; |
4770 | mvs*) |
4771 | case $cc_basename in |
4772 | - cxx*) |
4773 | + cxx) |
4774 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' |
4775 | ;; |
4776 | *) |
4777 | @@ -5086,14 +5210,14 @@ |
4778 | ;; |
4779 | osf3* | osf4* | osf5*) |
4780 | case $cc_basename in |
4781 | - KCC*) |
4782 | + KCC) |
4783 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' |
4784 | ;; |
4785 | - RCC*) |
4786 | + RCC) |
4787 | # Rational C++ 2.4.1 |
4788 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' |
4789 | ;; |
4790 | - cxx*) |
4791 | + cxx) |
4792 | # Digital/Compaq C++ |
4793 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4794 | # Make sure the PIC flag is empty. It appears that all Alpha |
4795 | @@ -5107,15 +5231,24 @@ |
4796 | ;; |
4797 | psos*) |
4798 | ;; |
4799 | + sco*) |
4800 | + case $cc_basename in |
4801 | + CC) |
4802 | + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
4803 | + ;; |
4804 | + *) |
4805 | + ;; |
4806 | + esac |
4807 | + ;; |
4808 | solaris*) |
4809 | case $cc_basename in |
4810 | - CC*) |
4811 | + CC) |
4812 | # Sun C++ 4.2, 5.x and Centerline C++ |
4813 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
4814 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
4815 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' |
4816 | ;; |
4817 | - gcx*) |
4818 | + gcx) |
4819 | # Green Hills C++ Compiler |
4820 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' |
4821 | ;; |
4822 | @@ -5125,12 +5258,12 @@ |
4823 | ;; |
4824 | sunos4*) |
4825 | case $cc_basename in |
4826 | - CC*) |
4827 | + CC) |
4828 | # Sun C++ 4.x |
4829 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' |
4830 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
4831 | ;; |
4832 | - lcc*) |
4833 | + lcc) |
4834 | # Lucid |
4835 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' |
4836 | ;; |
4837 | @@ -5140,7 +5273,7 @@ |
4838 | ;; |
4839 | tandem*) |
4840 | case $cc_basename in |
4841 | - NCC*) |
4842 | + NCC) |
4843 | # NonStop-UX NCC 3.20 |
4844 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
4845 | ;; |
4846 | @@ -5148,14 +5281,7 @@ |
4847 | ;; |
4848 | esac |
4849 | ;; |
4850 | - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) |
4851 | - case $cc_basename in |
4852 | - CC*) |
4853 | - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4854 | - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
4855 | - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
4856 | - ;; |
4857 | - esac |
4858 | + unixware*) |
4859 | ;; |
4860 | vxworks*) |
4861 | ;; |
4862 | @@ -5186,15 +5312,13 @@ |
4863 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' |
4864 | ;; |
4865 | |
4866 | - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) |
4867 | + beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) |
4868 | # PIC is the default for these OSes. |
4869 | ;; |
4870 | |
4871 | - mingw* | cygwin* | pw32* | os2*) |
4872 | + mingw* | pw32* | os2*) |
4873 | # This hack is so that the source file can tell whether it is being |
4874 | # built for inclusion in a dll (and should export symbols for example). |
4875 | - # Although the cygwin gcc ignores -fPIC, still need this for old-style |
4876 | - # (--disable-auto-import) libraries |
4877 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' |
4878 | ;; |
4879 | |
4880 | @@ -5204,11 +5328,6 @@ |
4881 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' |
4882 | ;; |
4883 | |
4884 | - interix3*) |
4885 | - # Interix 3.x gcc -fpic/-fPIC options generate broken code. |
4886 | - # Instead, we relocate shared libraries at runtime. |
4887 | - ;; |
4888 | - |
4889 | msdosdjgpp*) |
4890 | # Just because we use GCC doesn't mean we suddenly get shared libraries |
4891 | # on systems that don't support them. |
4892 | @@ -5225,7 +5344,7 @@ |
4893 | hpux*) |
4894 | # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but |
4895 | # not for PA HP-UX. |
4896 | - case $host_cpu in |
4897 | + case "$host_cpu" in |
4898 | hppa*64*|ia64*) |
4899 | # +Z the default |
4900 | ;; |
4901 | @@ -5254,7 +5373,7 @@ |
4902 | darwin*) |
4903 | # PIC is the default on this platform |
4904 | # Common symbols not allowed in MH_DYLIB files |
4905 | - case $cc_basename in |
4906 | + case "$cc_basename" in |
4907 | xlc*) |
4908 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' |
4909 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4910 | @@ -5262,7 +5381,7 @@ |
4911 | esac |
4912 | ;; |
4913 | |
4914 | - mingw* | cygwin* | pw32* | os2*) |
4915 | + mingw* | pw32* | os2*) |
4916 | # This hack is so that the source file can tell whether it is being |
4917 | # built for inclusion in a dll (and should export symbols for example). |
4918 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' |
4919 | @@ -5272,7 +5391,7 @@ |
4920 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4921 | # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but |
4922 | # not for PA HP-UX. |
4923 | - case $host_cpu in |
4924 | + case "$host_cpu" in |
4925 | hppa*64*|ia64*) |
4926 | # +Z the default |
4927 | ;; |
4928 | @@ -5295,41 +5414,18 @@ |
4929 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
4930 | ;; |
4931 | |
4932 | - linux* | k*bsd*-gnu) |
4933 | - case $cc_basename in |
4934 | + linux*) |
4935 | + case $CC in |
4936 | icc* | ecc*) |
4937 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4938 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
4939 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' |
4940 | ;; |
4941 | - pgcc* | pgf77* | pgf90* | pgf95*) |
4942 | - # Portland Group compilers (*not* the Pentium gcc compiler, |
4943 | - # which looks to be a dead project) |
4944 | - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4945 | - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' |
4946 | - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
4947 | - ;; |
4948 | ccc*) |
4949 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4950 | # All Alpha code is PIC. |
4951 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
4952 | ;; |
4953 | - *) |
4954 | - case `$CC -V 2>&1 | sed 5q` in |
4955 | - *Sun\ C*) |
4956 | - # Sun C 5.9 |
4957 | - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
4958 | - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
4959 | - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4960 | - ;; |
4961 | - *Sun\ F*) |
4962 | - # Sun Fortran 8.3 passes all unrecognized flags to the linker |
4963 | - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
4964 | - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
4965 | - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' |
4966 | - ;; |
4967 | - esac |
4968 | - ;; |
4969 | esac |
4970 | ;; |
4971 | |
4972 | @@ -5339,19 +5435,15 @@ |
4973 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
4974 | ;; |
4975 | |
4976 | - rdos*) |
4977 | - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
4978 | + sco3.2v5*) |
4979 | + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic' |
4980 | + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn' |
4981 | ;; |
4982 | |
4983 | solaris*) |
4984 | + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4985 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
4986 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
4987 | - case $cc_basename in |
4988 | - f77* | f90* | f95*) |
4989 | - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; |
4990 | - *) |
4991 | - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; |
4992 | - esac |
4993 | ;; |
4994 | |
4995 | sunos4*) |
4996 | @@ -5360,7 +5452,7 @@ |
4997 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
4998 | ;; |
4999 | |
5000 | - sysv4 | sysv4.2uw2* | sysv4.3*) |
The diff has been truncated for viewing.
Is there no chance of getting Debian to upload this version in the next couple of days?