Merge lp:~cyphermox/ubuntu/natty/evolution-rss/688776.stan+debfixes into lp:ubuntu/natty/evolution-rss
- Natty (11.04)
- 688776.stan+debfixes
- Merge into natty
Proposed by
Mathieu Trudel-Lapierre
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 22 | ||||
Proposed branch: | lp:~cyphermox/ubuntu/natty/evolution-rss/688776.stan+debfixes | ||||
Merge into: | lp:ubuntu/natty/evolution-rss | ||||
Diff against target: |
14651 lines (+5960/-2787) 31 files modified
ABOUT-NLS (+1282/-0) ChangeLog (+157/-0) Makefile.in (+8/-5) NEWS (+21/-0) TODO (+1/-0) aclocal.m4 (+24/-54) config.rpath (+672/-0) configure (+1604/-1466) configure.ac (+38/-16) debian/changelog (+13/-0) debian/control (+4/-3) debian/patches/allow_build_with_newer_webkit_43ca18b.diff (+22/-0) debian/patches/deprecated_gtk_symbols_e4b39fa.diff (+89/-0) ltmain.sh (+1044/-705) m4/libtool.m4 (+543/-462) m4/ltoptions.m4 (+7/-6) m4/ltversion.m4 (+5/-5) m4/lt~obsolete.m4 (+9/-3) m4/nls.m4 (+32/-0) pixmaps/Makefile.in (+5/-2) po/Makevars (+25/-0) po/POTFILES.skip (+3/-0) src/Makefile.am (+1/-0) src/Makefile.in (+6/-2) src/notification.c (+3/-2) src/parser.c (+89/-20) src/parser.h (+33/-5) src/rss-config-factory.c (+68/-9) src/rss-config-factory.h (+4/-0) src/rss-image.c (+40/-15) src/rss.c (+108/-7) |
||||
To merge this branch: | bzr merge lp:~cyphermox/ubuntu/natty/evolution-rss/688776.stan+debfixes | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Micah Gersten (community) | Approve | ||
Review via email: mp+47090@code.launchpad.net |
Commit message
Description of the change
Tristan Hill's excellent work to fix evolution-rss, plus the packaging changes reverted as suggested by Micah Gersten.
To post a comment you must log in.
- 20. By Mathieu Trudel-Lapierre
-
Remove one blob that doesn't belong in the backported deprecated symbols patch,
as it doesn't apply to evo-rss until after 0.2.2.
- 21. By Mathieu Trudel-Lapierre
-
Replace patch of uncertain origin with the equivalent already committed to
upstream git. - 22. By Mathieu Trudel-Lapierre
-
Explicitly mention changes to upstream patch (cherry-picked from git master)
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote : | # |
Hi Micah,
The changes you suggested are done. You mentioned checking whether the notes/details in the patches were valid DEP-3. I believe they are, but what's the verdict? ;)
Revision history for this message
Micah Gersten (micahg) wrote : | # |
Looks good, thanks for your work on this
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file 'ABOUT-NLS' |
2 | --- ABOUT-NLS 1970-01-01 00:00:00 +0000 |
3 | +++ ABOUT-NLS 2011-01-24 16:22:16 +0000 |
4 | @@ -0,0 +1,1282 @@ |
5 | +1 Notes on the Free Translation Project |
6 | +*************************************** |
7 | + |
8 | +Free software is going international! The Free Translation Project is |
9 | +a way to get maintainers of free software, translators, and users all |
10 | +together, so that free software will gradually become able to speak many |
11 | +languages. A few packages already provide translations for their |
12 | +messages. |
13 | + |
14 | + If you found this `ABOUT-NLS' file inside a distribution, you may |
15 | +assume that the distributed package does use GNU `gettext' internally, |
16 | +itself available at your nearest GNU archive site. But you do _not_ |
17 | +need to install GNU `gettext' prior to configuring, installing or using |
18 | +this package with messages translated. |
19 | + |
20 | + Installers will find here some useful hints. These notes also |
21 | +explain how users should proceed for getting the programs to use the |
22 | +available translations. They tell how people wanting to contribute and |
23 | +work on translations can contact the appropriate team. |
24 | + |
25 | +1.1 INSTALL Matters |
26 | +=================== |
27 | + |
28 | +Some packages are "localizable" when properly installed; the programs |
29 | +they contain can be made to speak your own native language. Most such |
30 | +packages use GNU `gettext'. Other packages have their own ways to |
31 | +internationalization, predating GNU `gettext'. |
32 | + |
33 | + By default, this package will be installed to allow translation of |
34 | +messages. It will automatically detect whether the system already |
35 | +provides the GNU `gettext' functions. Installers may use special |
36 | +options at configuration time for changing the default behaviour. The |
37 | +command: |
38 | + |
39 | + ./configure --disable-nls |
40 | + |
41 | +will _totally_ disable translation of messages. |
42 | + |
43 | + When you already have GNU `gettext' installed on your system and run |
44 | +configure without an option for your new package, `configure' will |
45 | +probably detect the previously built and installed `libintl' library |
46 | +and will decide to use it. If not, you may have to to use the |
47 | +`--with-libintl-prefix' option to tell `configure' where to look for it. |
48 | + |
49 | + Internationalized packages usually have many `po/LL.po' files, where |
50 | +LL gives an ISO 639 two-letter code identifying the language. Unless |
51 | +translations have been forbidden at `configure' time by using the |
52 | +`--disable-nls' switch, all available translations are installed |
53 | +together with the package. However, the environment variable `LINGUAS' |
54 | +may be set, prior to configuration, to limit the installed set. |
55 | +`LINGUAS' should then contain a space separated list of two-letter |
56 | +codes, stating which languages are allowed. |
57 | + |
58 | +1.2 Using This Package |
59 | +====================== |
60 | + |
61 | +As a user, if your language has been installed for this package, you |
62 | +only have to set the `LANG' environment variable to the appropriate |
63 | +`LL_CC' combination. If you happen to have the `LC_ALL' or some other |
64 | +`LC_xxx' environment variables set, you should unset them before |
65 | +setting `LANG', otherwise the setting of `LANG' will not have the |
66 | +desired effect. Here `LL' is an ISO 639 two-letter language code, and |
67 | +`CC' is an ISO 3166 two-letter country code. For example, let's |
68 | +suppose that you speak German and live in Germany. At the shell |
69 | +prompt, merely execute `setenv LANG de_DE' (in `csh'), |
70 | +`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash'). |
71 | +This can be done from your `.login' or `.profile' file, once and for |
72 | +all. |
73 | + |
74 | + You might think that the country code specification is redundant. |
75 | +But in fact, some languages have dialects in different countries. For |
76 | +example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The |
77 | +country code serves to distinguish the dialects. |
78 | + |
79 | + The locale naming convention of `LL_CC', with `LL' denoting the |
80 | +language and `CC' denoting the country, is the one use on systems based |
81 | +on GNU libc. On other systems, some variations of this scheme are |
82 | +used, such as `LL' or `LL_CC.ENCODING'. You can get the list of |
83 | +locales supported by your system for your language by running the |
84 | +command `locale -a | grep '^LL''. |
85 | + |
86 | + Not all programs have translations for all languages. By default, an |
87 | +English message is shown in place of a nonexistent translation. If you |
88 | +understand other languages, you can set up a priority list of languages. |
89 | +This is done through a different environment variable, called |
90 | +`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG' |
91 | +for the purpose of message handling, but you still need to have `LANG' |
92 | +set to the primary language; this is required by other parts of the |
93 | +system libraries. For example, some Swedish users who would rather |
94 | +read translations in German than English for when Swedish is not |
95 | +available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. |
96 | + |
97 | + Special advice for Norwegian users: The language code for Norwegian |
98 | +bokma*l changed from `no' to `nb' recently (in 2003). During the |
99 | +transition period, while some message catalogs for this language are |
100 | +installed under `nb' and some older ones under `no', it's recommended |
101 | +for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and |
102 | +older translations are used. |
103 | + |
104 | + In the `LANGUAGE' environment variable, but not in the `LANG' |
105 | +environment variable, `LL_CC' combinations can be abbreviated as `LL' |
106 | +to denote the language's main dialect. For example, `de' is equivalent |
107 | +to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' |
108 | +(Portuguese as spoken in Portugal) in this context. |
109 | + |
110 | +1.3 Translating Teams |
111 | +===================== |
112 | + |
113 | +For the Free Translation Project to be a success, we need interested |
114 | +people who like their own language and write it well, and who are also |
115 | +able to synergize with other translators speaking the same language. |
116 | +Each translation team has its own mailing list. The up-to-date list of |
117 | +teams can be found at the Free Translation Project's homepage, |
118 | +`http://translationproject.org/', in the "Teams" area. |
119 | + |
120 | + If you'd like to volunteer to _work_ at translating messages, you |
121 | +should become a member of the translating team for your own language. |
122 | +The subscribing address is _not_ the same as the list itself, it has |
123 | +`-request' appended. For example, speakers of Swedish can send a |
124 | +message to `sv-request@li.org', having this message body: |
125 | + |
126 | + subscribe |
127 | + |
128 | + Keep in mind that team members are expected to participate |
129 | +_actively_ in translations, or at solving translational difficulties, |
130 | +rather than merely lurking around. If your team does not exist yet and |
131 | +you want to start one, or if you are unsure about what to do or how to |
132 | +get started, please write to `coordinator@translationproject.org' to |
133 | +reach the coordinator for all translator teams. |
134 | + |
135 | + The English team is special. It works at improving and uniformizing |
136 | +the terminology in use. Proven linguistic skills are praised more than |
137 | +programming skills, here. |
138 | + |
139 | +1.4 Available Packages |
140 | +====================== |
141 | + |
142 | +Languages are not equally supported in all packages. The following |
143 | +matrix shows the current state of internationalization, as of June |
144 | +2010. The matrix shows, in regard of each package, for which languages |
145 | +PO files have been submitted to translation coordination, with a |
146 | +translation percentage of at least 50%. |
147 | + |
148 | + Ready PO files af am an ar as ast az be be@latin bg bn_IN bs ca |
149 | + +--------------------------------------------------+ |
150 | + a2ps | [] [] | |
151 | + aegis | | |
152 | + ant-phone | | |
153 | + anubis | | |
154 | + aspell | [] [] | |
155 | + bash | | |
156 | + bfd | | |
157 | + bibshelf | [] | |
158 | + binutils | | |
159 | + bison | | |
160 | + bison-runtime | [] | |
161 | + bluez-pin | [] [] | |
162 | + bombono-dvd | | |
163 | + buzztard | | |
164 | + cflow | | |
165 | + clisp | | |
166 | + coreutils | [] [] | |
167 | + cpio | | |
168 | + cppi | | |
169 | + cpplib | [] | |
170 | + cryptsetup | | |
171 | + dfarc | | |
172 | + dialog | [] [] | |
173 | + dico | | |
174 | + diffutils | [] | |
175 | + dink | | |
176 | + doodle | | |
177 | + e2fsprogs | [] | |
178 | + enscript | [] | |
179 | + exif | | |
180 | + fetchmail | [] | |
181 | + findutils | [] | |
182 | + flex | [] | |
183 | + freedink | | |
184 | + gas | | |
185 | + gawk | [] [] | |
186 | + gcal | [] | |
187 | + gcc | | |
188 | + gettext-examples | [] [] [] [] | |
189 | + gettext-runtime | [] [] | |
190 | + gettext-tools | [] [] | |
191 | + gip | [] | |
192 | + gjay | | |
193 | + gliv | [] | |
194 | + glunarclock | [] [] | |
195 | + gnubiff | | |
196 | + gnucash | [] | |
197 | + gnuedu | | |
198 | + gnulib | | |
199 | + gnunet | | |
200 | + gnunet-gtk | | |
201 | + gnutls | | |
202 | + gold | | |
203 | + gpe-aerial | | |
204 | + gpe-beam | | |
205 | + gpe-bluetooth | | |
206 | + gpe-calendar | | |
207 | + gpe-clock | [] | |
208 | + gpe-conf | | |
209 | + gpe-contacts | | |
210 | + gpe-edit | | |
211 | + gpe-filemanager | | |
212 | + gpe-go | | |
213 | + gpe-login | | |
214 | + gpe-ownerinfo | [] | |
215 | + gpe-package | | |
216 | + gpe-sketchbook | | |
217 | + gpe-su | [] | |
218 | + gpe-taskmanager | [] | |
219 | + gpe-timesheet | [] | |
220 | + gpe-today | [] | |
221 | + gpe-todo | | |
222 | + gphoto2 | | |
223 | + gprof | [] | |
224 | + gpsdrive | | |
225 | + gramadoir | | |
226 | + grep | | |
227 | + grub | [] [] | |
228 | + gsasl | | |
229 | + gss | | |
230 | + gst-plugins-bad | [] | |
231 | + gst-plugins-base | [] | |
232 | + gst-plugins-good | [] | |
233 | + gst-plugins-ugly | [] | |
234 | + gstreamer | [] [] [] | |
235 | + gtick | | |
236 | + gtkam | [] | |
237 | + gtkorphan | [] | |
238 | + gtkspell | [] [] [] | |
239 | + gutenprint | | |
240 | + hello | [] | |
241 | + help2man | | |
242 | + hylafax | | |
243 | + idutils | | |
244 | + indent | [] [] | |
245 | + iso_15924 | | |
246 | + iso_3166 | [] [] [] [] [] [] [] | |
247 | + iso_3166_2 | | |
248 | + iso_4217 | | |
249 | + iso_639 | [] [] [] [] | |
250 | + iso_639_3 | | |
251 | + jwhois | | |
252 | + kbd | | |
253 | + keytouch | [] | |
254 | + keytouch-editor | | |
255 | + keytouch-keyboa... | [] | |
256 | + klavaro | [] | |
257 | + latrine | | |
258 | + ld | [] | |
259 | + leafpad | [] [] | |
260 | + libc | [] [] | |
261 | + libexif | () | |
262 | + libextractor | | |
263 | + libgnutls | | |
264 | + libgpewidget | | |
265 | + libgpg-error | | |
266 | + libgphoto2 | | |
267 | + libgphoto2_port | | |
268 | + libgsasl | | |
269 | + libiconv | [] | |
270 | + libidn | | |
271 | + lifelines | | |
272 | + liferea | [] [] | |
273 | + lilypond | | |
274 | + linkdr | [] | |
275 | + lordsawar | | |
276 | + lprng | | |
277 | + lynx | [] | |
278 | + m4 | | |
279 | + mailfromd | | |
280 | + mailutils | | |
281 | + make | | |
282 | + man-db | | |
283 | + man-db-manpages | | |
284 | + minicom | | |
285 | + mkisofs | | |
286 | + myserver | | |
287 | + nano | [] [] | |
288 | + opcodes | | |
289 | + parted | | |
290 | + pies | | |
291 | + popt | | |
292 | + psmisc | | |
293 | + pspp | [] | |
294 | + pwdutils | | |
295 | + radius | [] | |
296 | + recode | [] [] | |
297 | + rosegarden | | |
298 | + rpm | | |
299 | + rush | | |
300 | + sarg | | |
301 | + screem | | |
302 | + scrollkeeper | [] [] [] | |
303 | + sed | [] [] | |
304 | + sharutils | [] [] | |
305 | + shishi | | |
306 | + skencil | | |
307 | + solfege | | |
308 | + solfege-manual | | |
309 | + soundtracker | | |
310 | + sp | | |
311 | + sysstat | | |
312 | + tar | [] | |
313 | + texinfo | | |
314 | + tin | | |
315 | + unicode-han-tra... | | |
316 | + unicode-transla... | | |
317 | + util-linux-ng | [] | |
318 | + vice | | |
319 | + vmm | | |
320 | + vorbis-tools | | |
321 | + wastesedge | | |
322 | + wdiff | | |
323 | + wget | [] [] | |
324 | + wyslij-po | | |
325 | + xchat | [] [] [] [] | |
326 | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] | |
327 | + xkeyboard-config | [] [] | |
328 | + +--------------------------------------------------+ |
329 | + af am an ar as ast az be be@latin bg bn_IN bs ca |
330 | + 6 0 1 2 3 19 1 10 3 28 3 1 38 |
331 | + |
332 | + crh cs da de el en en_GB en_ZA eo es et eu fa |
333 | + +-------------------------------------------------+ |
334 | + a2ps | [] [] [] [] [] [] [] | |
335 | + aegis | [] [] [] | |
336 | + ant-phone | [] () | |
337 | + anubis | [] [] | |
338 | + aspell | [] [] [] [] [] | |
339 | + bash | [] [] [] | |
340 | + bfd | [] | |
341 | + bibshelf | [] [] [] | |
342 | + binutils | [] | |
343 | + bison | [] [] | |
344 | + bison-runtime | [] [] [] [] | |
345 | + bluez-pin | [] [] [] [] [] [] | |
346 | + bombono-dvd | [] | |
347 | + buzztard | [] [] [] | |
348 | + cflow | [] [] | |
349 | + clisp | [] [] [] [] | |
350 | + coreutils | [] [] [] [] | |
351 | + cpio | | |
352 | + cppi | | |
353 | + cpplib | [] [] [] | |
354 | + cryptsetup | [] | |
355 | + dfarc | [] [] [] | |
356 | + dialog | [] [] [] [] [] | |
357 | + dico | | |
358 | + diffutils | [] [] [] [] [] [] | |
359 | + dink | [] [] [] | |
360 | + doodle | [] | |
361 | + e2fsprogs | [] [] [] | |
362 | + enscript | [] [] [] | |
363 | + exif | () [] [] | |
364 | + fetchmail | [] [] () [] [] [] | |
365 | + findutils | [] [] [] | |
366 | + flex | [] [] | |
367 | + freedink | [] [] [] | |
368 | + gas | [] | |
369 | + gawk | [] [] [] | |
370 | + gcal | [] | |
371 | + gcc | [] [] | |
372 | + gettext-examples | [] [] [] [] | |
373 | + gettext-runtime | [] [] [] [] | |
374 | + gettext-tools | [] [] [] | |
375 | + gip | [] [] [] [] | |
376 | + gjay | [] | |
377 | + gliv | [] [] [] | |
378 | + glunarclock | [] [] | |
379 | + gnubiff | () | |
380 | + gnucash | [] () () () () | |
381 | + gnuedu | [] [] | |
382 | + gnulib | [] [] | |
383 | + gnunet | | |
384 | + gnunet-gtk | [] | |
385 | + gnutls | [] [] | |
386 | + gold | [] | |
387 | + gpe-aerial | [] [] [] [] | |
388 | + gpe-beam | [] [] [] [] | |
389 | + gpe-bluetooth | [] [] | |
390 | + gpe-calendar | [] | |
391 | + gpe-clock | [] [] [] [] | |
392 | + gpe-conf | [] [] [] | |
393 | + gpe-contacts | [] [] [] | |
394 | + gpe-edit | [] [] | |
395 | + gpe-filemanager | [] [] [] | |
396 | + gpe-go | [] [] [] [] | |
397 | + gpe-login | [] [] | |
398 | + gpe-ownerinfo | [] [] [] [] | |
399 | + gpe-package | [] [] [] | |
400 | + gpe-sketchbook | [] [] [] [] | |
401 | + gpe-su | [] [] [] [] | |
402 | + gpe-taskmanager | [] [] [] [] | |
403 | + gpe-timesheet | [] [] [] [] | |
404 | + gpe-today | [] [] [] [] | |
405 | + gpe-todo | [] [] [] | |
406 | + gphoto2 | [] [] () [] [] [] | |
407 | + gprof | [] [] [] | |
408 | + gpsdrive | [] [] [] | |
409 | + gramadoir | [] [] [] | |
410 | + grep | [] | |
411 | + grub | [] [] | |
412 | + gsasl | [] | |
413 | + gss | | |
414 | + gst-plugins-bad | [] [] [] [] [] | |
415 | + gst-plugins-base | [] [] [] [] [] | |
416 | + gst-plugins-good | [] [] [] [] [] [] | |
417 | + gst-plugins-ugly | [] [] [] [] [] [] | |
418 | + gstreamer | [] [] [] [] [] | |
419 | + gtick | [] () [] | |
420 | + gtkam | [] [] () [] [] | |
421 | + gtkorphan | [] [] [] [] | |
422 | + gtkspell | [] [] [] [] [] [] [] | |
423 | + gutenprint | [] [] [] | |
424 | + hello | [] [] [] [] | |
425 | + help2man | [] | |
426 | + hylafax | [] [] | |
427 | + idutils | [] [] | |
428 | + indent | [] [] [] [] [] [] [] | |
429 | + iso_15924 | [] () [] [] | |
430 | + iso_3166 | [] [] [] [] () [] [] [] () | |
431 | + iso_3166_2 | () | |
432 | + iso_4217 | [] [] [] () [] [] | |
433 | + iso_639 | [] [] [] [] () [] [] | |
434 | + iso_639_3 | [] | |
435 | + jwhois | [] | |
436 | + kbd | [] [] [] [] [] | |
437 | + keytouch | [] [] | |
438 | + keytouch-editor | [] [] | |
439 | + keytouch-keyboa... | [] | |
440 | + klavaro | [] [] [] [] | |
441 | + latrine | [] () | |
442 | + ld | [] [] | |
443 | + leafpad | [] [] [] [] [] [] | |
444 | + libc | [] [] [] [] | |
445 | + libexif | [] [] () | |
446 | + libextractor | | |
447 | + libgnutls | [] | |
448 | + libgpewidget | [] [] | |
449 | + libgpg-error | [] [] | |
450 | + libgphoto2 | [] () | |
451 | + libgphoto2_port | [] () [] | |
452 | + libgsasl | | |
453 | + libiconv | [] [] [] [] [] | |
454 | + libidn | [] [] [] | |
455 | + lifelines | [] () | |
456 | + liferea | [] [] [] [] [] | |
457 | + lilypond | [] [] [] | |
458 | + linkdr | [] [] [] | |
459 | + lordsawar | [] | |
460 | + lprng | | |
461 | + lynx | [] [] [] [] | |
462 | + m4 | [] [] [] [] | |
463 | + mailfromd | | |
464 | + mailutils | [] | |
465 | + make | [] [] [] | |
466 | + man-db | | |
467 | + man-db-manpages | | |
468 | + minicom | [] [] [] [] | |
469 | + mkisofs | | |
470 | + myserver | | |
471 | + nano | [] [] [] | |
472 | + opcodes | [] [] | |
473 | + parted | [] [] | |
474 | + pies | | |
475 | + popt | [] [] [] [] [] | |
476 | + psmisc | [] [] [] | |
477 | + pspp | [] | |
478 | + pwdutils | [] | |
479 | + radius | [] | |
480 | + recode | [] [] [] [] [] [] | |
481 | + rosegarden | () () () | |
482 | + rpm | [] [] [] | |
483 | + rush | | |
484 | + sarg | | |
485 | + screem | | |
486 | + scrollkeeper | [] [] [] [] [] | |
487 | + sed | [] [] [] [] [] [] | |
488 | + sharutils | [] [] [] [] | |
489 | + shishi | | |
490 | + skencil | [] () [] | |
491 | + solfege | [] [] [] | |
492 | + solfege-manual | [] [] | |
493 | + soundtracker | [] [] [] | |
494 | + sp | [] | |
495 | + sysstat | [] [] [] | |
496 | + tar | [] [] [] [] | |
497 | + texinfo | [] [] [] | |
498 | + tin | [] [] | |
499 | + unicode-han-tra... | | |
500 | + unicode-transla... | | |
501 | + util-linux-ng | [] [] [] [] | |
502 | + vice | () () | |
503 | + vmm | [] | |
504 | + vorbis-tools | [] [] | |
505 | + wastesedge | [] | |
506 | + wdiff | [] [] | |
507 | + wget | [] [] [] | |
508 | + wyslij-po | | |
509 | + xchat | [] [] [] [] [] | |
510 | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] | |
511 | + xkeyboard-config | [] [] [] [] [] [] | |
512 | + +-------------------------------------------------+ |
513 | + crh cs da de el en en_GB en_ZA eo es et eu fa |
514 | + 5 64 105 117 18 1 8 0 28 89 18 19 0 |
515 | + |
516 | + fi fr ga gl gu he hi hr hu hy id is it ja ka kn |
517 | + +----------------------------------------------------+ |
518 | + a2ps | [] [] [] [] | |
519 | + aegis | [] [] | |
520 | + ant-phone | [] [] | |
521 | + anubis | [] [] [] [] | |
522 | + aspell | [] [] [] [] | |
523 | + bash | [] [] [] [] | |
524 | + bfd | [] [] [] | |
525 | + bibshelf | [] [] [] [] [] | |
526 | + binutils | [] [] [] | |
527 | + bison | [] [] [] [] | |
528 | + bison-runtime | [] [] [] [] [] [] | |
529 | + bluez-pin | [] [] [] [] [] [] [] [] | |
530 | + bombono-dvd | [] | |
531 | + buzztard | [] | |
532 | + cflow | [] [] [] | |
533 | + clisp | [] | |
534 | + coreutils | [] [] [] [] [] | |
535 | + cpio | [] [] [] [] | |
536 | + cppi | [] [] | |
537 | + cpplib | [] [] [] | |
538 | + cryptsetup | [] [] [] | |
539 | + dfarc | [] [] [] | |
540 | + dialog | [] [] [] [] [] [] [] | |
541 | + dico | | |
542 | + diffutils | [] [] [] [] [] [] [] [] [] | |
543 | + dink | [] | |
544 | + doodle | [] [] | |
545 | + e2fsprogs | [] [] | |
546 | + enscript | [] [] [] [] | |
547 | + exif | [] [] [] [] [] [] | |
548 | + fetchmail | [] [] [] [] | |
549 | + findutils | [] [] [] [] [] [] | |
550 | + flex | [] [] [] | |
551 | + freedink | [] [] [] | |
552 | + gas | [] [] | |
553 | + gawk | [] [] [] [] () [] | |
554 | + gcal | [] | |
555 | + gcc | [] | |
556 | + gettext-examples | [] [] [] [] [] [] [] | |
557 | + gettext-runtime | [] [] [] [] [] [] | |
558 | + gettext-tools | [] [] [] [] | |
559 | + gip | [] [] [] [] [] [] | |
560 | + gjay | [] | |
561 | + gliv | [] () | |
562 | + glunarclock | [] [] [] [] | |
563 | + gnubiff | () [] () | |
564 | + gnucash | () () () () () [] | |
565 | + gnuedu | [] [] | |
566 | + gnulib | [] [] [] [] [] [] | |
567 | + gnunet | | |
568 | + gnunet-gtk | [] | |
569 | + gnutls | [] [] | |
570 | + gold | [] [] | |
571 | + gpe-aerial | [] [] [] | |
572 | + gpe-beam | [] [] [] [] | |
573 | + gpe-bluetooth | [] [] [] [] | |
574 | + gpe-calendar | [] [] | |
575 | + gpe-clock | [] [] [] [] [] | |
576 | + gpe-conf | [] [] [] [] | |
577 | + gpe-contacts | [] [] [] [] | |
578 | + gpe-edit | [] [] [] | |
579 | + gpe-filemanager | [] [] [] [] | |
580 | + gpe-go | [] [] [] [] [] | |
581 | + gpe-login | [] [] [] | |
582 | + gpe-ownerinfo | [] [] [] [] [] | |
583 | + gpe-package | [] [] [] | |
584 | + gpe-sketchbook | [] [] [] [] | |
585 | + gpe-su | [] [] [] [] [] [] | |
586 | + gpe-taskmanager | [] [] [] [] [] | |
587 | + gpe-timesheet | [] [] [] [] [] | |
588 | + gpe-today | [] [] [] [] [] [] [] | |
589 | + gpe-todo | [] [] [] | |
590 | + gphoto2 | [] [] [] [] [] [] | |
591 | + gprof | [] [] [] [] | |
592 | + gpsdrive | [] [] [] | |
593 | + gramadoir | [] [] [] | |
594 | + grep | [] [] | |
595 | + grub | [] [] [] [] | |
596 | + gsasl | [] [] [] [] [] | |
597 | + gss | [] [] [] [] [] | |
598 | + gst-plugins-bad | [] [] [] [] [] [] | |
599 | + gst-plugins-base | [] [] [] [] [] [] | |
600 | + gst-plugins-good | [] [] [] [] [] [] | |
601 | + gst-plugins-ugly | [] [] [] [] [] [] | |
602 | + gstreamer | [] [] [] [] [] | |
603 | + gtick | [] [] [] [] [] | |
604 | + gtkam | [] [] [] [] [] | |
605 | + gtkorphan | [] [] [] | |
606 | + gtkspell | [] [] [] [] [] [] [] [] [] | |
607 | + gutenprint | [] [] [] [] | |
608 | + hello | [] [] [] | |
609 | + help2man | [] [] | |
610 | + hylafax | [] | |
611 | + idutils | [] [] [] [] [] [] | |
612 | + indent | [] [] [] [] [] [] [] [] | |
613 | + iso_15924 | [] () [] [] | |
614 | + iso_3166 | [] () [] [] [] [] [] [] [] [] [] [] | |
615 | + iso_3166_2 | () [] [] [] | |
616 | + iso_4217 | [] () [] [] [] [] | |
617 | + iso_639 | [] () [] [] [] [] [] [] [] | |
618 | + iso_639_3 | () [] [] | |
619 | + jwhois | [] [] [] [] [] | |
620 | + kbd | [] [] | |
621 | + keytouch | [] [] [] [] [] [] | |
622 | + keytouch-editor | [] [] [] [] [] | |
623 | + keytouch-keyboa... | [] [] [] [] [] | |
624 | + klavaro | [] [] | |
625 | + latrine | [] [] [] | |
626 | + ld | [] [] [] [] | |
627 | + leafpad | [] [] [] [] [] [] [] () | |
628 | + libc | [] [] [] [] [] | |
629 | + libexif | [] | |
630 | + libextractor | | |
631 | + libgnutls | [] [] | |
632 | + libgpewidget | [] [] [] [] | |
633 | + libgpg-error | [] [] | |
634 | + libgphoto2 | [] [] [] | |
635 | + libgphoto2_port | [] [] [] | |
636 | + libgsasl | [] [] [] [] [] | |
637 | + libiconv | [] [] [] [] [] [] | |
638 | + libidn | [] [] [] [] | |
639 | + lifelines | () | |
640 | + liferea | [] [] [] [] | |
641 | + lilypond | [] [] | |
642 | + linkdr | [] [] [] [] [] | |
643 | + lordsawar | | |
644 | + lprng | [] | |
645 | + lynx | [] [] [] [] [] | |
646 | + m4 | [] [] [] [] [] [] | |
647 | + mailfromd | | |
648 | + mailutils | [] [] | |
649 | + make | [] [] [] [] [] [] [] [] [] | |
650 | + man-db | [] [] | |
651 | + man-db-manpages | [] | |
652 | + minicom | [] [] [] [] [] | |
653 | + mkisofs | [] [] [] [] | |
654 | + myserver | | |
655 | + nano | [] [] [] [] [] [] | |
656 | + opcodes | [] [] [] [] | |
657 | + parted | [] [] [] [] | |
658 | + pies | | |
659 | + popt | [] [] [] [] [] [] [] [] [] | |
660 | + psmisc | [] [] [] | |
661 | + pspp | | |
662 | + pwdutils | [] [] | |
663 | + radius | [] [] | |
664 | + recode | [] [] [] [] [] [] [] [] | |
665 | + rosegarden | () () () () () | |
666 | + rpm | [] [] | |
667 | + rush | | |
668 | + sarg | [] | |
669 | + screem | [] [] | |
670 | + scrollkeeper | [] [] [] [] | |
671 | + sed | [] [] [] [] [] [] [] [] | |
672 | + sharutils | [] [] [] [] [] [] [] | |
673 | + shishi | [] | |
674 | + skencil | [] | |
675 | + solfege | [] [] [] [] | |
676 | + solfege-manual | [] [] | |
677 | + soundtracker | [] [] | |
678 | + sp | [] () | |
679 | + sysstat | [] [] [] [] [] | |
680 | + tar | [] [] [] [] [] [] [] | |
681 | + texinfo | [] [] [] [] | |
682 | + tin | [] | |
683 | + unicode-han-tra... | | |
684 | + unicode-transla... | [] [] | |
685 | + util-linux-ng | [] [] [] [] [] [] | |
686 | + vice | () () () | |
687 | + vmm | [] | |
688 | + vorbis-tools | [] | |
689 | + wastesedge | () () | |
690 | + wdiff | [] | |
691 | + wget | [] [] [] [] [] [] [] [] | |
692 | + wyslij-po | [] [] [] | |
693 | + xchat | [] [] [] [] [] [] [] [] [] | |
694 | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] | |
695 | + xkeyboard-config | [] [] [] [] [] | |
696 | + +----------------------------------------------------+ |
697 | + fi fr ga gl gu he hi hr hu hy id is it ja ka kn |
698 | + 105 121 53 20 4 8 3 5 53 2 120 5 84 67 0 4 |
699 | + |
700 | + ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne |
701 | + +-----------------------------------------------+ |
702 | + a2ps | [] | |
703 | + aegis | | |
704 | + ant-phone | | |
705 | + anubis | [] [] | |
706 | + aspell | [] | |
707 | + bash | | |
708 | + bfd | | |
709 | + bibshelf | [] [] | |
710 | + binutils | | |
711 | + bison | [] | |
712 | + bison-runtime | [] [] [] [] [] | |
713 | + bluez-pin | [] [] [] [] [] | |
714 | + bombono-dvd | | |
715 | + buzztard | | |
716 | + cflow | | |
717 | + clisp | | |
718 | + coreutils | [] | |
719 | + cpio | | |
720 | + cppi | | |
721 | + cpplib | | |
722 | + cryptsetup | | |
723 | + dfarc | [] | |
724 | + dialog | [] [] [] [] [] | |
725 | + dico | | |
726 | + diffutils | [] [] | |
727 | + dink | | |
728 | + doodle | | |
729 | + e2fsprogs | | |
730 | + enscript | | |
731 | + exif | [] | |
732 | + fetchmail | | |
733 | + findutils | | |
734 | + flex | | |
735 | + freedink | [] | |
736 | + gas | | |
737 | + gawk | | |
738 | + gcal | | |
739 | + gcc | | |
740 | + gettext-examples | [] [] [] [] | |
741 | + gettext-runtime | [] | |
742 | + gettext-tools | [] | |
743 | + gip | [] [] | |
744 | + gjay | | |
745 | + gliv | | |
746 | + glunarclock | [] | |
747 | + gnubiff | | |
748 | + gnucash | () () () () | |
749 | + gnuedu | | |
750 | + gnulib | | |
751 | + gnunet | | |
752 | + gnunet-gtk | | |
753 | + gnutls | [] | |
754 | + gold | | |
755 | + gpe-aerial | [] | |
756 | + gpe-beam | [] | |
757 | + gpe-bluetooth | [] [] | |
758 | + gpe-calendar | [] | |
759 | + gpe-clock | [] [] [] [] [] | |
760 | + gpe-conf | [] [] | |
761 | + gpe-contacts | [] [] | |
762 | + gpe-edit | [] | |
763 | + gpe-filemanager | [] [] | |
764 | + gpe-go | [] [] [] | |
765 | + gpe-login | [] | |
766 | + gpe-ownerinfo | [] [] | |
767 | + gpe-package | [] [] | |
768 | + gpe-sketchbook | [] [] | |
769 | + gpe-su | [] [] [] [] [] [] | |
770 | + gpe-taskmanager | [] [] [] [] [] [] | |
771 | + gpe-timesheet | [] [] | |
772 | + gpe-today | [] [] [] [] | |
773 | + gpe-todo | [] [] | |
774 | + gphoto2 | | |
775 | + gprof | [] | |
776 | + gpsdrive | | |
777 | + gramadoir | | |
778 | + grep | | |
779 | + grub | | |
780 | + gsasl | | |
781 | + gss | | |
782 | + gst-plugins-bad | [] [] [] [] | |
783 | + gst-plugins-base | [] [] | |
784 | + gst-plugins-good | [] [] | |
785 | + gst-plugins-ugly | [] [] [] [] [] | |
786 | + gstreamer | | |
787 | + gtick | | |
788 | + gtkam | [] | |
789 | + gtkorphan | [] [] | |
790 | + gtkspell | [] [] [] [] [] [] [] | |
791 | + gutenprint | | |
792 | + hello | [] [] [] | |
793 | + help2man | | |
794 | + hylafax | | |
795 | + idutils | | |
796 | + indent | | |
797 | + iso_15924 | [] [] | |
798 | + iso_3166 | [] [] () [] [] [] [] [] | |
799 | + iso_3166_2 | | |
800 | + iso_4217 | [] [] | |
801 | + iso_639 | [] [] | |
802 | + iso_639_3 | [] | |
803 | + jwhois | [] | |
804 | + kbd | | |
805 | + keytouch | [] | |
806 | + keytouch-editor | [] | |
807 | + keytouch-keyboa... | [] | |
808 | + klavaro | [] | |
809 | + latrine | [] | |
810 | + ld | | |
811 | + leafpad | [] [] [] | |
812 | + libc | [] | |
813 | + libexif | | |
814 | + libextractor | | |
815 | + libgnutls | [] | |
816 | + libgpewidget | [] [] | |
817 | + libgpg-error | | |
818 | + libgphoto2 | | |
819 | + libgphoto2_port | | |
820 | + libgsasl | | |
821 | + libiconv | | |
822 | + libidn | | |
823 | + lifelines | | |
824 | + liferea | | |
825 | + lilypond | | |
826 | + linkdr | | |
827 | + lordsawar | | |
828 | + lprng | | |
829 | + lynx | | |
830 | + m4 | | |
831 | + mailfromd | | |
832 | + mailutils | | |
833 | + make | [] | |
834 | + man-db | | |
835 | + man-db-manpages | | |
836 | + minicom | [] | |
837 | + mkisofs | | |
838 | + myserver | | |
839 | + nano | [] [] | |
840 | + opcodes | | |
841 | + parted | | |
842 | + pies | | |
843 | + popt | [] [] [] | |
844 | + psmisc | | |
845 | + pspp | | |
846 | + pwdutils | | |
847 | + radius | | |
848 | + recode | | |
849 | + rosegarden | | |
850 | + rpm | | |
851 | + rush | | |
852 | + sarg | | |
853 | + screem | | |
854 | + scrollkeeper | [] [] | |
855 | + sed | | |
856 | + sharutils | | |
857 | + shishi | | |
858 | + skencil | | |
859 | + solfege | [] | |
860 | + solfege-manual | | |
861 | + soundtracker | | |
862 | + sp | | |
863 | + sysstat | [] | |
864 | + tar | [] | |
865 | + texinfo | [] | |
866 | + tin | | |
867 | + unicode-han-tra... | | |
868 | + unicode-transla... | | |
869 | + util-linux-ng | | |
870 | + vice | | |
871 | + vmm | | |
872 | + vorbis-tools | | |
873 | + wastesedge | | |
874 | + wdiff | | |
875 | + wget | [] | |
876 | + wyslij-po | | |
877 | + xchat | [] [] [] | |
878 | + xdg-user-dirs | [] [] [] [] [] [] [] [] | |
879 | + xkeyboard-config | [] [] [] | |
880 | + +-----------------------------------------------+ |
881 | + ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne |
882 | + 20 5 10 1 13 48 4 2 2 4 24 10 20 3 1 |
883 | + |
884 | + nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr |
885 | + +---------------------------------------------------+ |
886 | + a2ps | [] [] [] [] [] [] [] [] | |
887 | + aegis | [] [] [] | |
888 | + ant-phone | [] [] | |
889 | + anubis | [] [] [] | |
890 | + aspell | [] [] [] [] [] | |
891 | + bash | [] [] | |
892 | + bfd | [] | |
893 | + bibshelf | [] [] | |
894 | + binutils | [] [] | |
895 | + bison | [] [] [] | |
896 | + bison-runtime | [] [] [] [] [] [] [] | |
897 | + bluez-pin | [] [] [] [] [] [] [] [] | |
898 | + bombono-dvd | [] () | |
899 | + buzztard | [] [] | |
900 | + cflow | [] | |
901 | + clisp | [] [] | |
902 | + coreutils | [] [] [] [] [] [] | |
903 | + cpio | [] [] [] | |
904 | + cppi | [] | |
905 | + cpplib | [] | |
906 | + cryptsetup | [] | |
907 | + dfarc | [] | |
908 | + dialog | [] [] [] [] | |
909 | + dico | [] | |
910 | + diffutils | [] [] [] [] [] [] | |
911 | + dink | () | |
912 | + doodle | [] [] | |
913 | + e2fsprogs | [] [] | |
914 | + enscript | [] [] [] [] [] | |
915 | + exif | [] [] [] () [] | |
916 | + fetchmail | [] [] [] [] | |
917 | + findutils | [] [] [] [] [] | |
918 | + flex | [] [] [] [] [] | |
919 | + freedink | [] [] | |
920 | + gas | | |
921 | + gawk | [] [] [] [] | |
922 | + gcal | | |
923 | + gcc | [] | |
924 | + gettext-examples | [] [] [] [] [] [] [] [] | |
925 | + gettext-runtime | [] [] [] [] [] [] [] [] [] | |
926 | + gettext-tools | [] [] [] [] [] [] | |
927 | + gip | [] [] [] [] [] | |
928 | + gjay | | |
929 | + gliv | [] [] [] [] [] [] | |
930 | + glunarclock | [] [] [] [] [] | |
931 | + gnubiff | [] () | |
932 | + gnucash | [] () () () | |
933 | + gnuedu | [] | |
934 | + gnulib | [] [] [] [] | |
935 | + gnunet | | |
936 | + gnunet-gtk | | |
937 | + gnutls | [] [] | |
938 | + gold | | |
939 | + gpe-aerial | [] [] [] [] [] [] [] | |
940 | + gpe-beam | [] [] [] [] [] [] [] | |
941 | + gpe-bluetooth | [] [] | |
942 | + gpe-calendar | [] [] [] [] | |
943 | + gpe-clock | [] [] [] [] [] [] [] [] | |
944 | + gpe-conf | [] [] [] [] [] [] [] | |
945 | + gpe-contacts | [] [] [] [] [] | |
946 | + gpe-edit | [] [] [] | |
947 | + gpe-filemanager | [] [] [] | |
948 | + gpe-go | [] [] [] [] [] [] [] [] | |
949 | + gpe-login | [] [] | |
950 | + gpe-ownerinfo | [] [] [] [] [] [] [] [] | |
951 | + gpe-package | [] [] | |
952 | + gpe-sketchbook | [] [] [] [] [] [] [] | |
953 | + gpe-su | [] [] [] [] [] [] [] [] | |
954 | + gpe-taskmanager | [] [] [] [] [] [] [] [] | |
955 | + gpe-timesheet | [] [] [] [] [] [] [] [] | |
956 | + gpe-today | [] [] [] [] [] [] [] [] | |
957 | + gpe-todo | [] [] [] [] [] | |
958 | + gphoto2 | [] [] [] [] [] [] [] [] | |
959 | + gprof | [] [] [] | |
960 | + gpsdrive | [] [] | |
961 | + gramadoir | [] [] | |
962 | + grep | [] [] [] [] | |
963 | + grub | [] [] [] | |
964 | + gsasl | [] [] [] [] | |
965 | + gss | [] [] [] | |
966 | + gst-plugins-bad | [] [] [] [] [] [] | |
967 | + gst-plugins-base | [] [] [] [] [] | |
968 | + gst-plugins-good | [] [] [] [] [] | |
969 | + gst-plugins-ugly | [] [] [] [] [] [] | |
970 | + gstreamer | [] [] [] [] [] | |
971 | + gtick | [] [] [] | |
972 | + gtkam | [] [] [] [] [] [] | |
973 | + gtkorphan | [] | |
974 | + gtkspell | [] [] [] [] [] [] [] [] [] [] | |
975 | + gutenprint | [] [] | |
976 | + hello | [] [] [] [] | |
977 | + help2man | [] [] | |
978 | + hylafax | [] | |
979 | + idutils | [] [] [] [] [] | |
980 | + indent | [] [] [] [] [] [] [] | |
981 | + iso_15924 | [] [] [] [] | |
982 | + iso_3166 | [] [] [] [] [] () [] [] [] [] [] [] [] [] | |
983 | + iso_3166_2 | [] [] [] | |
984 | + iso_4217 | [] [] [] [] [] [] [] [] | |
985 | + iso_639 | [] [] [] [] [] [] [] [] [] | |
986 | + iso_639_3 | [] [] | |
987 | + jwhois | [] [] [] [] | |
988 | + kbd | [] [] [] | |
989 | + keytouch | [] [] [] | |
990 | + keytouch-editor | [] [] [] | |
991 | + keytouch-keyboa... | [] [] [] | |
992 | + klavaro | [] [] | |
993 | + latrine | [] [] | |
994 | + ld | | |
995 | + leafpad | [] [] [] [] [] [] [] [] [] | |
996 | + libc | [] [] [] [] | |
997 | + libexif | [] [] () [] | |
998 | + libextractor | | |
999 | + libgnutls | [] [] | |
1000 | + libgpewidget | [] [] [] | |
1001 | + libgpg-error | [] [] | |
1002 | + libgphoto2 | [] [] | |
1003 | + libgphoto2_port | [] [] [] [] [] | |
1004 | + libgsasl | [] [] [] [] [] | |
1005 | + libiconv | [] [] [] [] [] | |
1006 | + libidn | [] [] | |
1007 | + lifelines | [] [] | |
1008 | + liferea | [] [] [] [] [] () () [] | |
1009 | + lilypond | [] | |
1010 | + linkdr | [] [] [] | |
1011 | + lordsawar | | |
1012 | + lprng | [] | |
1013 | + lynx | [] [] [] | |
1014 | + m4 | [] [] [] [] [] | |
1015 | + mailfromd | [] | |
1016 | + mailutils | [] | |
1017 | + make | [] [] [] [] | |
1018 | + man-db | [] [] [] | |
1019 | + man-db-manpages | [] [] [] | |
1020 | + minicom | [] [] [] [] | |
1021 | + mkisofs | [] [] [] | |
1022 | + myserver | | |
1023 | + nano | [] [] [] [] | |
1024 | + opcodes | [] [] | |
1025 | + parted | [] [] [] [] | |
1026 | + pies | [] | |
1027 | + popt | [] [] [] [] | |
1028 | + psmisc | [] [] [] | |
1029 | + pspp | [] [] | |
1030 | + pwdutils | [] | |
1031 | + radius | [] [] [] | |
1032 | + recode | [] [] [] [] [] [] [] [] | |
1033 | + rosegarden | () () | |
1034 | + rpm | [] [] [] | |
1035 | + rush | [] [] | |
1036 | + sarg | | |
1037 | + screem | | |
1038 | + scrollkeeper | [] [] [] [] [] [] [] [] | |
1039 | + sed | [] [] [] [] [] [] [] [] [] | |
1040 | + sharutils | [] [] [] [] | |
1041 | + shishi | [] | |
1042 | + skencil | [] [] | |
1043 | + solfege | [] [] [] [] | |
1044 | + solfege-manual | [] [] [] | |
1045 | + soundtracker | [] | |
1046 | + sp | | |
1047 | + sysstat | [] [] [] [] | |
1048 | + tar | [] [] [] [] | |
1049 | + texinfo | [] [] [] [] | |
1050 | + tin | [] | |
1051 | + unicode-han-tra... | | |
1052 | + unicode-transla... | | |
1053 | + util-linux-ng | [] [] [] [] [] | |
1054 | + vice | [] | |
1055 | + vmm | [] | |
1056 | + vorbis-tools | [] [] | |
1057 | + wastesedge | [] | |
1058 | + wdiff | [] [] | |
1059 | + wget | [] [] [] [] [] [] [] | |
1060 | + wyslij-po | [] [] [] | |
1061 | + xchat | [] [] [] [] [] [] [] [] [] | |
1062 | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] [] | |
1063 | + xkeyboard-config | [] [] [] | |
1064 | + +---------------------------------------------------+ |
1065 | + nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr |
1066 | + 135 10 4 7 105 1 29 62 47 91 3 54 46 9 37 |
1067 | + |
1068 | + sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW |
1069 | + +---------------------------------------------------+ |
1070 | + a2ps | [] [] [] [] [] | 27 |
1071 | + aegis | [] | 9 |
1072 | + ant-phone | [] [] [] [] | 9 |
1073 | + anubis | [] [] [] [] | 15 |
1074 | + aspell | [] [] [] | 20 |
1075 | + bash | [] [] [] | 12 |
1076 | + bfd | [] | 6 |
1077 | + bibshelf | [] [] [] | 16 |
1078 | + binutils | [] [] | 8 |
1079 | + bison | [] [] | 12 |
1080 | + bison-runtime | [] [] [] [] [] [] | 29 |
1081 | + bluez-pin | [] [] [] [] [] [] [] [] | 37 |
1082 | + bombono-dvd | [] | 4 |
1083 | + buzztard | [] | 7 |
1084 | + cflow | [] [] [] | 9 |
1085 | + clisp | | 10 |
1086 | + coreutils | [] [] [] [] | 22 |
1087 | + cpio | [] [] [] [] [] [] | 13 |
1088 | + cppi | [] [] | 5 |
1089 | + cpplib | [] [] [] [] [] [] | 14 |
1090 | + cryptsetup | [] [] | 7 |
1091 | + dfarc | [] | 9 |
1092 | + dialog | [] [] [] [] [] [] [] | 30 |
1093 | + dico | [] | 2 |
1094 | + diffutils | [] [] [] [] [] [] | 30 |
1095 | + dink | | 4 |
1096 | + doodle | [] [] | 7 |
1097 | + e2fsprogs | [] [] [] | 11 |
1098 | + enscript | [] [] [] [] | 17 |
1099 | + exif | [] [] [] | 16 |
1100 | + fetchmail | [] [] [] | 17 |
1101 | + findutils | [] [] [] [] [] | 20 |
1102 | + flex | [] [] [] [] | 15 |
1103 | + freedink | [] | 10 |
1104 | + gas | [] | 4 |
1105 | + gawk | [] [] [] [] | 18 |
1106 | + gcal | [] [] | 5 |
1107 | + gcc | [] [] [] | 7 |
1108 | + gettext-examples | [] [] [] [] [] [] [] | 34 |
1109 | + gettext-runtime | [] [] [] [] [] [] [] | 29 |
1110 | + gettext-tools | [] [] [] [] [] [] | 22 |
1111 | + gip | [] [] [] [] | 22 |
1112 | + gjay | [] | 3 |
1113 | + gliv | [] [] [] | 14 |
1114 | + glunarclock | [] [] [] [] [] | 19 |
1115 | + gnubiff | [] [] | 4 |
1116 | + gnucash | () [] () [] () | 10 |
1117 | + gnuedu | [] [] | 7 |
1118 | + gnulib | [] [] [] [] | 16 |
1119 | + gnunet | [] | 1 |
1120 | + gnunet-gtk | [] [] [] | 5 |
1121 | + gnutls | [] [] [] | 10 |
1122 | + gold | [] | 4 |
1123 | + gpe-aerial | [] [] [] | 18 |
1124 | + gpe-beam | [] [] [] | 19 |
1125 | + gpe-bluetooth | [] [] [] | 13 |
1126 | + gpe-calendar | [] [] [] [] | 12 |
1127 | + gpe-clock | [] [] [] [] [] | 28 |
1128 | + gpe-conf | [] [] [] [] | 20 |
1129 | + gpe-contacts | [] [] [] | 17 |
1130 | + gpe-edit | [] [] [] | 12 |
1131 | + gpe-filemanager | [] [] [] [] | 16 |
1132 | + gpe-go | [] [] [] [] [] | 25 |
1133 | + gpe-login | [] [] [] | 11 |
1134 | + gpe-ownerinfo | [] [] [] [] [] | 25 |
1135 | + gpe-package | [] [] [] | 13 |
1136 | + gpe-sketchbook | [] [] [] | 20 |
1137 | + gpe-su | [] [] [] [] [] | 30 |
1138 | + gpe-taskmanager | [] [] [] [] [] | 29 |
1139 | + gpe-timesheet | [] [] [] [] [] | 25 |
1140 | + gpe-today | [] [] [] [] [] [] | 30 |
1141 | + gpe-todo | [] [] [] [] | 17 |
1142 | + gphoto2 | [] [] [] [] [] | 24 |
1143 | + gprof | [] [] [] | 15 |
1144 | + gpsdrive | [] [] [] | 11 |
1145 | + gramadoir | [] [] [] | 11 |
1146 | + grep | [] [] [] | 10 |
1147 | + grub | [] [] [] | 14 |
1148 | + gsasl | [] [] [] [] | 14 |
1149 | + gss | [] [] [] | 11 |
1150 | + gst-plugins-bad | [] [] [] [] | 26 |
1151 | + gst-plugins-base | [] [] [] [] [] | 24 |
1152 | + gst-plugins-good | [] [] [] [] | 24 |
1153 | + gst-plugins-ugly | [] [] [] [] [] | 29 |
1154 | + gstreamer | [] [] [] [] | 22 |
1155 | + gtick | [] [] [] | 13 |
1156 | + gtkam | [] [] [] | 20 |
1157 | + gtkorphan | [] [] [] | 14 |
1158 | + gtkspell | [] [] [] [] [] [] [] [] [] | 45 |
1159 | + gutenprint | [] | 10 |
1160 | + hello | [] [] [] [] [] [] | 21 |
1161 | + help2man | [] [] | 7 |
1162 | + hylafax | [] | 5 |
1163 | + idutils | [] [] [] [] | 17 |
1164 | + indent | [] [] [] [] [] [] | 30 |
1165 | + iso_15924 | () [] () [] [] | 16 |
1166 | + iso_3166 | [] [] () [] [] () [] [] [] () | 53 |
1167 | + iso_3166_2 | () [] () [] | 9 |
1168 | + iso_4217 | [] () [] [] () [] [] | 26 |
1169 | + iso_639 | [] [] [] () [] () [] [] [] [] | 38 |
1170 | + iso_639_3 | [] () | 8 |
1171 | + jwhois | [] [] [] [] [] | 16 |
1172 | + kbd | [] [] [] [] [] | 15 |
1173 | + keytouch | [] [] [] | 16 |
1174 | + keytouch-editor | [] [] [] | 14 |
1175 | + keytouch-keyboa... | [] [] [] | 14 |
1176 | + klavaro | [] | 11 |
1177 | + latrine | [] [] [] | 10 |
1178 | + ld | [] [] [] [] | 11 |
1179 | + leafpad | [] [] [] [] [] [] | 33 |
1180 | + libc | [] [] [] [] [] | 21 |
1181 | + libexif | [] () | 7 |
1182 | + libextractor | [] | 1 |
1183 | + libgnutls | [] [] [] | 9 |
1184 | + libgpewidget | [] [] [] | 14 |
1185 | + libgpg-error | [] [] [] | 9 |
1186 | + libgphoto2 | [] [] | 8 |
1187 | + libgphoto2_port | [] [] [] [] | 14 |
1188 | + libgsasl | [] [] [] | 13 |
1189 | + libiconv | [] [] [] [] | 21 |
1190 | + libidn | () [] [] | 11 |
1191 | + lifelines | [] | 4 |
1192 | + liferea | [] [] [] | 21 |
1193 | + lilypond | [] | 7 |
1194 | + linkdr | [] [] [] [] [] | 17 |
1195 | + lordsawar | | 1 |
1196 | + lprng | [] | 3 |
1197 | + lynx | [] [] [] [] | 17 |
1198 | + m4 | [] [] [] [] | 19 |
1199 | + mailfromd | [] [] | 3 |
1200 | + mailutils | [] | 5 |
1201 | + make | [] [] [] [] | 21 |
1202 | + man-db | [] [] [] | 8 |
1203 | + man-db-manpages | | 4 |
1204 | + minicom | [] [] | 16 |
1205 | + mkisofs | [] [] | 9 |
1206 | + myserver | | 0 |
1207 | + nano | [] [] [] [] | 21 |
1208 | + opcodes | [] [] [] | 11 |
1209 | + parted | [] [] [] [] [] | 15 |
1210 | + pies | [] [] | 3 |
1211 | + popt | [] [] [] [] [] [] | 27 |
1212 | + psmisc | [] [] | 11 |
1213 | + pspp | | 4 |
1214 | + pwdutils | [] [] | 6 |
1215 | + radius | [] [] | 9 |
1216 | + recode | [] [] [] [] | 28 |
1217 | + rosegarden | () | 0 |
1218 | + rpm | [] [] [] | 11 |
1219 | + rush | [] [] | 4 |
1220 | + sarg | | 1 |
1221 | + screem | [] | 3 |
1222 | + scrollkeeper | [] [] [] [] [] | 27 |
1223 | + sed | [] [] [] [] [] | 30 |
1224 | + sharutils | [] [] [] [] [] | 22 |
1225 | + shishi | [] | 3 |
1226 | + skencil | [] [] | 7 |
1227 | + solfege | [] [] [] [] | 16 |
1228 | + solfege-manual | [] | 8 |
1229 | + soundtracker | [] [] [] | 9 |
1230 | + sp | [] | 3 |
1231 | + sysstat | [] [] | 15 |
1232 | + tar | [] [] [] [] [] [] | 23 |
1233 | + texinfo | [] [] [] [] [] | 17 |
1234 | + tin | | 4 |
1235 | + unicode-han-tra... | | 0 |
1236 | + unicode-transla... | | 2 |
1237 | + util-linux-ng | [] [] [] [] | 20 |
1238 | + vice | () () | 1 |
1239 | + vmm | [] | 4 |
1240 | + vorbis-tools | [] | 6 |
1241 | + wastesedge | | 2 |
1242 | + wdiff | [] [] | 7 |
1243 | + wget | [] [] [] [] [] | 26 |
1244 | + wyslij-po | [] [] | 8 |
1245 | + xchat | [] [] [] [] [] [] | 36 |
1246 | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] | 63 |
1247 | + xkeyboard-config | [] [] [] | 22 |
1248 | + +---------------------------------------------------+ |
1249 | + 85 teams sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW |
1250 | + 178 domains 119 1 3 3 0 10 65 51 155 17 98 7 41 2618 |
1251 | + |
1252 | + Some counters in the preceding matrix are higher than the number of |
1253 | +visible blocks let us expect. This is because a few extra PO files are |
1254 | +used for implementing regional variants of languages, or language |
1255 | +dialects. |
1256 | + |
1257 | + For a PO file in the matrix above to be effective, the package to |
1258 | +which it applies should also have been internationalized and |
1259 | +distributed as such by its maintainer. There might be an observable |
1260 | +lag between the mere existence a PO file and its wide availability in a |
1261 | +distribution. |
1262 | + |
1263 | + If June 2010 seems to be old, you may fetch a more recent copy of |
1264 | +this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date |
1265 | +matrix with full percentage details can be found at |
1266 | +`http://translationproject.org/extra/matrix.html'. |
1267 | + |
1268 | +1.5 Using `gettext' in new packages |
1269 | +=================================== |
1270 | + |
1271 | +If you are writing a freely available program and want to |
1272 | +internationalize it you are welcome to use GNU `gettext' in your |
1273 | +package. Of course you have to respect the GNU Library General Public |
1274 | +License which covers the use of the GNU `gettext' library. This means |
1275 | +in particular that even non-free programs can use `libintl' as a shared |
1276 | +library, whereas only free software can use `libintl' as a static |
1277 | +library or use modified versions of `libintl'. |
1278 | + |
1279 | + Once the sources are changed appropriately and the setup can handle |
1280 | +the use of `gettext' the only thing missing are the translations. The |
1281 | +Free Translation Project is also available for packages which are not |
1282 | +developed inside the GNU project. Therefore the information given above |
1283 | +applies also for every other Free Software Project. Contact |
1284 | +`coordinator@translationproject.org' to make the `.pot' files available |
1285 | +to the translation teams. |
1286 | + |
1287 | |
1288 | === modified file 'ChangeLog' |
1289 | --- ChangeLog 2010-09-05 21:13:36 +0000 |
1290 | +++ ChangeLog 2011-01-24 16:22:16 +0000 |
1291 | @@ -1,5 +1,162 @@ |
1292 | # Generated by Makefile. Do not edit. |
1293 | |
1294 | +commit 54e57906b0ede0d1f4066c5e34cb7c406b473798 |
1295 | +Author: Lucian Langa <lucilanga@gnome.org> |
1296 | +Date: Sun Dec 19 17:48:56 2010 +0200 |
1297 | + |
1298 | + add last moment fix for gtkhtml detection |
1299 | + |
1300 | + configure.ac | 10 +++++++++- |
1301 | + src/Makefile.am | 1 + |
1302 | + 2 files changed, 10 insertions(+), 1 deletions(-) |
1303 | + |
1304 | +commit 7253fb54a34f9d63847321f0ebf0be15f6fbe679 |
1305 | +Author: Lucian Langa <lucilanga@gnome.org> |
1306 | +Date: Sun Dec 19 09:42:10 2010 +0200 |
1307 | + |
1308 | + NEWS update for 0.2.2 release |
1309 | + |
1310 | + NEWS | 14 ++++++++++++++ |
1311 | + 1 files changed, 14 insertions(+), 0 deletions(-) |
1312 | + |
1313 | +commit b2bf29c72ad0670e49d0b35e44f81e8504e49e07 |
1314 | +Author: Lucian Langa <lucilanga@gnome.org> |
1315 | +Date: Sun Dec 12 17:42:47 2010 +0200 |
1316 | + |
1317 | + do not generate warnings on missing shell view |
1318 | + |
1319 | + src/notification.c | 5 +++-- |
1320 | + 1 files changed, 3 insertions(+), 2 deletions(-) |
1321 | + |
1322 | +commit ed67995aa31497b4f8beb63976d118b191abc2d6 |
1323 | +Author: Lucian Langa <lucilanga@gnome.org> |
1324 | +Date: Mon Dec 6 00:12:09 2010 +0200 |
1325 | + |
1326 | + fix render engine combo box |
1327 | + |
1328 | + src/rss-config-factory.c | 12 ++++++------ |
1329 | + 1 files changed, 6 insertions(+), 6 deletions(-) |
1330 | + |
1331 | +commit 3207ce4bf15334c3abdb91ada7e814aa2f6184ea |
1332 | +Author: Lucian Langa <lucilanga@gnome.org> |
1333 | +Date: Sun Dec 5 10:25:13 2010 +0200 |
1334 | + |
1335 | + fix gtkhtml detection |
1336 | + |
1337 | + configure.ac | 20 +++++++++++++++----- |
1338 | + 1 files changed, 15 insertions(+), 5 deletions(-) |
1339 | + |
1340 | +commit 17e1f8553f9abc2322dbe07893df75aa14cec7f1 |
1341 | +Author: Lucian Langa <lucilanga@gnome.org> |
1342 | +Date: Sat Dec 4 00:19:37 2010 +0200 |
1343 | + |
1344 | + fix sending out rss messages |
1345 | + |
1346 | + configure.ac | 26 +++++++++++++++----------- |
1347 | + src/parser.c | 25 +++++++------------------ |
1348 | + 2 files changed, 22 insertions(+), 29 deletions(-) |
1349 | + |
1350 | +commit 4f05983378a360cf86edd12d322ebb1b62713eb2 |
1351 | +Author: Lucian Langa <lucilanga@gnome.org> |
1352 | +Date: Fri Dec 3 14:13:01 2010 +0200 |
1353 | + |
1354 | + Bug 635157 - Bad character encoding when showing full text |
1355 | + |
1356 | + src/rss.c | 11 ++++++++--- |
1357 | + 1 files changed, 8 insertions(+), 3 deletions(-) |
1358 | + |
1359 | +commit 1bfa8cc00bbceb035bad8c6d5d9547b45feba8d5 |
1360 | +Author: Lucian Langa <lucilanga@gnome.org> |
1361 | +Date: Wed Dec 1 14:02:53 2010 +0200 |
1362 | + |
1363 | + fallback to <link> when resolving atom relative links |
1364 | + |
1365 | + src/parser.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- |
1366 | + src/parser.h | 38 +++++++++++++++++++++++--- |
1367 | + 2 files changed, 114 insertions(+), 6 deletions(-) |
1368 | + |
1369 | +commit da162058db718cd8c13cd3c9b921216196b5f802 |
1370 | +Author: Lucian Langa <lucilanga@gnome.org> |
1371 | +Date: Sat Oct 30 19:28:57 2010 +0300 |
1372 | + |
1373 | + prefer folder info instead of folder object in display_folder_icon() |
1374 | + It considerably speeds up the startup phase |
1375 | + |
1376 | + src/rss-image.c | 19 ++++++++----------- |
1377 | + 1 files changed, 8 insertions(+), 11 deletions(-) |
1378 | + |
1379 | +commit 6ff70e88f556c4e070c32879263f7547793563c8 |
1380 | +Author: Lucian Langa <lucilanga@gnome.org> |
1381 | +Date: Wed Oct 6 21:44:32 2010 +0300 |
1382 | + |
1383 | + post release version bump |
1384 | + |
1385 | + configure.ac | 2 +- |
1386 | + 1 files changed, 1 insertions(+), 1 deletions(-) |
1387 | + |
1388 | +commit ec7f7f71e3d0f8cf06d528313cf3aa0ec008e764 |
1389 | +Author: Lucian Langa <lucilanga@gnome.org> |
1390 | +Date: Wed Oct 6 21:39:00 2010 +0300 |
1391 | + |
1392 | + update version for 0.2.1 release |
1393 | + |
1394 | + NEWS | 7 +++++++ |
1395 | + TODO | 1 + |
1396 | + configure.ac | 2 +- |
1397 | + 3 files changed, 9 insertions(+), 1 deletions(-) |
1398 | + |
1399 | +commit 04947f7c133910fa4fa5c1aba6c319536da86846 |
1400 | +Author: Lucian Langa <lucilanga@gnome.org> |
1401 | +Date: Tue Oct 5 20:48:40 2010 +0300 |
1402 | + |
1403 | + fix compiler warnings |
1404 | + |
1405 | + src/parser.c | 2 +- |
1406 | + src/rss-config-factory.c | 2 +- |
1407 | + src/rss.c | 1 - |
1408 | + 3 files changed, 2 insertions(+), 3 deletions(-) |
1409 | + |
1410 | +commit 89de79c4df967652e35e5ffabea9908e9ca4c656 |
1411 | +Author: Lucian Langa <lucilanga@gnome.org> |
1412 | +Date: Tue Oct 5 20:45:10 2010 +0300 |
1413 | + |
1414 | + work around e_preferences_window modifications |
1415 | + |
1416 | + src/rss-config-factory.c | 12 ++++++++++++ |
1417 | + 1 files changed, 12 insertions(+), 0 deletions(-) |
1418 | + |
1419 | +commit 2a378b2ba8b9a713064ee6e9fe6ee56063361857 |
1420 | +Author: Lucian Langa <lucilanga@gnome.org> |
1421 | +Date: Tue Oct 5 20:20:14 2010 +0300 |
1422 | + |
1423 | + adapt to GError camel modifications |
1424 | + |
1425 | + po/POTFILES.in | 2 +- |
1426 | + src/rss-config-factory.c | 51 ++++++++++++++++++++++++++- |
1427 | + src/rss-config-factory.h | 4 ++ |
1428 | + src/rss-image.c | 32 +++++++++++++++-- |
1429 | + src/rss.c | 85 ++++++++++++++++++++++++++++++++++++++++++++-- |
1430 | + 5 files changed, 164 insertions(+), 10 deletions(-) |
1431 | + |
1432 | +commit c70062c09be1557a632c32a5b96d2798377a7de3 |
1433 | +Author: Lucian Langa <lucilanga@gnome.org> |
1434 | +Date: Tue Oct 5 08:29:28 2010 +0300 |
1435 | + |
1436 | + adapt to EMFormat changes |
1437 | + |
1438 | + src/rss-image.c | 4 ++++ |
1439 | + src/rss.c | 12 ++++++++++++ |
1440 | + 2 files changed, 16 insertions(+), 0 deletions(-) |
1441 | + |
1442 | +commit 3e96e0533d2e2f2e0b596afbc3c1146fe134354b |
1443 | +Author: Lucian Langa <lucilanga@gnome.org> |
1444 | +Date: Tue Oct 5 08:29:13 2010 +0300 |
1445 | + |
1446 | + work around latest gtk deprecations |
1447 | + |
1448 | + src/rss.c | 6 ++++++ |
1449 | + 1 files changed, 6 insertions(+), 0 deletions(-) |
1450 | + |
1451 | commit c773129cd7bd3769a05e778a336c075f105d3303 |
1452 | Author: Lucian Langa <lucilanga@gnome.org> |
1453 | Date: Tue Jul 20 23:01:57 2010 +0300 |
1454 | |
1455 | === modified file 'Makefile.in' |
1456 | --- Makefile.in 2010-09-05 21:13:36 +0000 |
1457 | +++ Makefile.in 2011-01-24 16:22:16 +0000 |
1458 | @@ -37,16 +37,16 @@ |
1459 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
1460 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ |
1461 | $(srcdir)/evolution-rss.spec.in $(top_srcdir)/configure \ |
1462 | - AUTHORS COPYING ChangeLog INSTALL NEWS TODO compile \ |
1463 | - config.guess config.sub depcomp install-sh ltmain.sh missing \ |
1464 | - mkinstalldirs |
1465 | + ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS TODO compile \ |
1466 | + config.guess config.rpath config.sub depcomp install-sh \ |
1467 | + ltmain.sh missing mkinstalldirs |
1468 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
1469 | am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ |
1470 | $(top_srcdir)/m4/evolution.m4 $(top_srcdir)/m4/gecko.m4 \ |
1471 | $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ |
1472 | $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
1473 | $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
1474 | - $(top_srcdir)/configure.ac |
1475 | + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac |
1476 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1477 | $(ACLOCAL_M4) |
1478 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
1479 | @@ -179,8 +179,10 @@ |
1480 | GMSGFMT = @GMSGFMT@ |
1481 | GPP = @GPP@ |
1482 | GREP = @GREP@ |
1483 | +GTKHTML_CFLAGS = @GTKHTML_CFLAGS@ |
1484 | GTKHTML_EDITOR_CFLAGS = @GTKHTML_EDITOR_CFLAGS@ |
1485 | GTKHTML_EDITOR_LIBS = @GTKHTML_EDITOR_LIBS@ |
1486 | +GTKHTML_LIBS = @GTKHTML_LIBS@ |
1487 | GTK_VERSION = @GTK_VERSION@ |
1488 | HAVE_BUGGY_GECKO = @HAVE_BUGGY_GECKO@ |
1489 | HAVE_GECKO = @HAVE_GECKO@ |
1490 | @@ -245,6 +247,8 @@ |
1491 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
1492 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
1493 | PKG_CONFIG = @PKG_CONFIG@ |
1494 | +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ |
1495 | +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ |
1496 | PLUGINDIR_IN_SERVER_FILE = @PLUGINDIR_IN_SERVER_FILE@ |
1497 | PLUGIN_INSTALL_DIR = @PLUGIN_INSTALL_DIR@ |
1498 | POFILES = @POFILES@ |
1499 | @@ -310,7 +314,6 @@ |
1500 | libexecdir = @libexecdir@ |
1501 | localedir = @localedir@ |
1502 | localstatedir = @localstatedir@ |
1503 | -lt_ECHO = @lt_ECHO@ |
1504 | mandir = @mandir@ |
1505 | mkdir_p = @mkdir_p@ |
1506 | oldincludedir = @oldincludedir@ |
1507 | |
1508 | === modified file 'NEWS' |
1509 | --- NEWS 2010-09-05 21:13:36 +0000 |
1510 | +++ NEWS 2011-01-24 16:22:16 +0000 |
1511 | @@ -1,3 +1,24 @@ |
1512 | +Evolution-RSS 0.2.2 |
1513 | +------------------------------ |
1514 | + |
1515 | +Miscellaneous Fixes: |
1516 | + Remove warnings on missing shellview. |
1517 | + Fix render engine combo. |
1518 | + Fix gtkhtml detection. |
1519 | + Fix sending RSS articles as mails. |
1520 | + Improve displaying of folder icons (it greately speeds up the loading) |
1521 | + |
1522 | +Bug fixes: |
1523 | +635157 - Bad character encoding when showing full text |
1524 | +636053 - Host-relative links in atom feed don't work |
1525 | + |
1526 | +Evolution-RSS 0.2.1 |
1527 | +------------------------------ |
1528 | + |
1529 | +Miscellaneous Fixes: |
1530 | + Add support for evolution 2.32 |
1531 | + |
1532 | + |
1533 | Evolution-RSS 0.2.0 |
1534 | ------------------------------ |
1535 | |
1536 | |
1537 | === modified file 'TODO' |
1538 | --- TODO 2010-09-05 21:13:36 +0000 |
1539 | +++ TODO 2011-01-24 16:22:16 +0000 |
1540 | @@ -41,3 +41,4 @@ |
1541 | * check key->session big memleak ? |
1542 | * markup fail perhaps in web auth dialog |
1543 | * nice to add progressive downloading of images |
1544 | + * redraw browser window after submit ? |
1545 | |
1546 | === modified file 'aclocal.m4' |
1547 | --- aclocal.m4 2010-09-05 21:13:36 +0000 |
1548 | +++ aclocal.m4 2011-01-24 16:22:16 +0000 |
1549 | @@ -13,8 +13,8 @@ |
1550 | |
1551 | m4_ifndef([AC_AUTOCONF_VERSION], |
1552 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
1553 | -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, |
1554 | -[m4_warning([this file was generated for autoconf 2.65. |
1555 | +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],, |
1556 | +[m4_warning([this file was generated for autoconf 2.66. |
1557 | You have another version of autoconf. It may work, but is not guaranteed to. |
1558 | If you have problems, you may need to regenerate the build system entirely. |
1559 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
1560 | @@ -346,7 +346,7 @@ |
1561 | |
1562 | dnl These rules are solely for the distribution goal. While doing this |
1563 | dnl we only have to keep exactly one list of the available catalogs |
1564 | - dnl in configure.in. |
1565 | + dnl in configure.ac. |
1566 | for lang in $ALL_LINGUAS; do |
1567 | GMOFILES="$GMOFILES $lang.gmo" |
1568 | POFILES="$POFILES $lang.po" |
1569 | @@ -475,7 +475,7 @@ |
1570 | dnl |
1571 | dnl Now the definitions that aclocal will find |
1572 | dnl |
1573 | -ifdef(glib_configure_in,[],[ |
1574 | +ifdef(glib_configure_ac,[],[ |
1575 | AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) |
1576 | AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) |
1577 | ])dnl |
1578 | @@ -639,40 +639,8 @@ |
1579 | AC_SUBST(WARN_CXXFLAGS) |
1580 | ]) |
1581 | |
1582 | -# nls.m4 serial 5 (gettext-0.18) |
1583 | -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, |
1584 | -dnl Inc. |
1585 | -dnl This file is free software; the Free Software Foundation |
1586 | -dnl gives unlimited permission to copy and/or distribute it, |
1587 | -dnl with or without modifications, as long as this notice is preserved. |
1588 | -dnl |
1589 | -dnl This file can can be used in projects which are not available under |
1590 | -dnl the GNU General Public License or the GNU Library General Public |
1591 | -dnl License but which still want to provide support for the GNU gettext |
1592 | -dnl functionality. |
1593 | -dnl Please note that the actual code of the GNU gettext library is covered |
1594 | -dnl by the GNU Library General Public License, and the rest of the GNU |
1595 | -dnl gettext package package is covered by the GNU General Public License. |
1596 | -dnl They are *not* in the public domain. |
1597 | - |
1598 | -dnl Authors: |
1599 | -dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. |
1600 | -dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. |
1601 | - |
1602 | -AC_PREREQ([2.50]) |
1603 | - |
1604 | -AC_DEFUN([AM_NLS], |
1605 | -[ |
1606 | - AC_MSG_CHECKING([whether NLS is requested]) |
1607 | - dnl Default is enabled NLS |
1608 | - AC_ARG_ENABLE([nls], |
1609 | - [ --disable-nls do not use Native Language Support], |
1610 | - USE_NLS=$enableval, USE_NLS=yes) |
1611 | - AC_MSG_RESULT([$USE_NLS]) |
1612 | - AC_SUBST([USE_NLS]) |
1613 | -]) |
1614 | - |
1615 | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- |
1616 | +# serial 1 (pkg-config-0.24) |
1617 | # |
1618 | # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. |
1619 | # |
1620 | @@ -700,7 +668,10 @@ |
1621 | AC_DEFUN([PKG_PROG_PKG_CONFIG], |
1622 | [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) |
1623 | m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) |
1624 | -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl |
1625 | +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) |
1626 | +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) |
1627 | +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) |
1628 | + |
1629 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
1630 | AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) |
1631 | fi |
1632 | @@ -713,7 +684,6 @@ |
1633 | AC_MSG_RESULT([no]) |
1634 | PKG_CONFIG="" |
1635 | fi |
1636 | - |
1637 | fi[]dnl |
1638 | ])# PKG_PROG_PKG_CONFIG |
1639 | |
1640 | @@ -722,21 +692,20 @@ |
1641 | # Check to see whether a particular set of modules exists. Similar |
1642 | # to PKG_CHECK_MODULES(), but does not set variables or print errors. |
1643 | # |
1644 | -# |
1645 | -# Similar to PKG_CHECK_MODULES, make sure that the first instance of |
1646 | -# this or PKG_CHECK_MODULES is called, or make sure to call |
1647 | -# PKG_CHECK_EXISTS manually |
1648 | +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) |
1649 | +# only at the first occurence in configure.ac, so if the first place |
1650 | +# it's called might be skipped (such as if it is within an "if", you |
1651 | +# have to call PKG_CHECK_EXISTS manually |
1652 | # -------------------------------------------------------------- |
1653 | AC_DEFUN([PKG_CHECK_EXISTS], |
1654 | [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
1655 | if test -n "$PKG_CONFIG" && \ |
1656 | AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then |
1657 | - m4_ifval([$2], [$2], [:]) |
1658 | + m4_default([$2], [:]) |
1659 | m4_ifvaln([$3], [else |
1660 | $3])dnl |
1661 | fi]) |
1662 | |
1663 | - |
1664 | # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) |
1665 | # --------------------------------------------- |
1666 | m4_define([_PKG_CONFIG], |
1667 | @@ -789,6 +758,7 @@ |
1668 | See the pkg-config man page for more details.]) |
1669 | |
1670 | if test $pkg_failed = yes; then |
1671 | + AC_MSG_RESULT([no]) |
1672 | _PKG_SHORT_ERRORS_SUPPORTED |
1673 | if test $_pkg_short_errors_supported = yes; then |
1674 | $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` |
1675 | @@ -798,7 +768,7 @@ |
1676 | # Put the nasty error message in config.log where it belongs |
1677 | echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD |
1678 | |
1679 | - ifelse([$4], , [AC_MSG_ERROR(dnl |
1680 | + m4_default([$4], [AC_MSG_ERROR( |
1681 | [Package requirements ($2) were not met: |
1682 | |
1683 | $$1_PKG_ERRORS |
1684 | @@ -806,25 +776,24 @@ |
1685 | Consider adjusting the PKG_CONFIG_PATH environment variable if you |
1686 | installed software in a non-standard prefix. |
1687 | |
1688 | -_PKG_TEXT |
1689 | -])], |
1690 | - [AC_MSG_RESULT([no]) |
1691 | - $4]) |
1692 | +_PKG_TEXT]) |
1693 | + ]) |
1694 | elif test $pkg_failed = untried; then |
1695 | - ifelse([$4], , [AC_MSG_FAILURE(dnl |
1696 | + AC_MSG_RESULT([no]) |
1697 | + m4_default([$4], [AC_MSG_FAILURE( |
1698 | [The pkg-config script could not be found or is too old. Make sure it |
1699 | is in your PATH or set the PKG_CONFIG environment variable to the full |
1700 | path to pkg-config. |
1701 | |
1702 | _PKG_TEXT |
1703 | |
1704 | -To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], |
1705 | - [$4]) |
1706 | +To get pkg-config, see <http://pkg-config.freedesktop.org/>.]) |
1707 | + ]) |
1708 | else |
1709 | $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS |
1710 | $1[]_LIBS=$pkg_cv_[]$1[]_LIBS |
1711 | AC_MSG_RESULT([yes]) |
1712 | - ifelse([$3], , :, [$3]) |
1713 | + $3 |
1714 | fi[]dnl |
1715 | ])# PKG_CHECK_MODULES |
1716 | |
1717 | @@ -1869,3 +1838,4 @@ |
1718 | m4_include([m4/ltsugar.m4]) |
1719 | m4_include([m4/ltversion.m4]) |
1720 | m4_include([m4/lt~obsolete.m4]) |
1721 | +m4_include([m4/nls.m4]) |
1722 | |
1723 | === added file 'config.rpath' |
1724 | --- config.rpath 1970-01-01 00:00:00 +0000 |
1725 | +++ config.rpath 2011-01-24 16:22:16 +0000 |
1726 | @@ -0,0 +1,672 @@ |
1727 | +#! /bin/sh |
1728 | +# Output a system dependent set of variables, describing how to set the |
1729 | +# run time search path of shared libraries in an executable. |
1730 | +# |
1731 | +# Copyright 1996-2010 Free Software Foundation, Inc. |
1732 | +# Taken from GNU libtool, 2001 |
1733 | +# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 |
1734 | +# |
1735 | +# This file is free software; the Free Software Foundation gives |
1736 | +# unlimited permission to copy and/or distribute it, with or without |
1737 | +# modifications, as long as this notice is preserved. |
1738 | +# |
1739 | +# The first argument passed to this file is the canonical host specification, |
1740 | +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM |
1741 | +# or |
1742 | +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM |
1743 | +# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld |
1744 | +# should be set by the caller. |
1745 | +# |
1746 | +# The set of defined variables is at the end of this script. |
1747 | + |
1748 | +# Known limitations: |
1749 | +# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer |
1750 | +# than 256 bytes, otherwise the compiler driver will dump core. The only |
1751 | +# known workaround is to choose shorter directory names for the build |
1752 | +# directory and/or the installation directory. |
1753 | + |
1754 | +# All known linkers require a `.a' archive for static linking (except MSVC, |
1755 | +# which needs '.lib'). |
1756 | +libext=a |
1757 | +shrext=.so |
1758 | + |
1759 | +host="$1" |
1760 | +host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` |
1761 | +host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` |
1762 | +host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` |
1763 | + |
1764 | +# Code taken from libtool.m4's _LT_CC_BASENAME. |
1765 | + |
1766 | +for cc_temp in $CC""; do |
1767 | + case $cc_temp in |
1768 | + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; |
1769 | + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; |
1770 | + \-*) ;; |
1771 | + *) break;; |
1772 | + esac |
1773 | +done |
1774 | +cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` |
1775 | + |
1776 | +# Code taken from libtool.m4's _LT_COMPILER_PIC. |
1777 | + |
1778 | +wl= |
1779 | +if test "$GCC" = yes; then |
1780 | + wl='-Wl,' |
1781 | +else |
1782 | + case "$host_os" in |
1783 | + aix*) |
1784 | + wl='-Wl,' |
1785 | + ;; |
1786 | + darwin*) |
1787 | + case $cc_basename in |
1788 | + xlc*) |
1789 | + wl='-Wl,' |
1790 | + ;; |
1791 | + esac |
1792 | + ;; |
1793 | + mingw* | cygwin* | pw32* | os2* | cegcc*) |
1794 | + ;; |
1795 | + hpux9* | hpux10* | hpux11*) |
1796 | + wl='-Wl,' |
1797 | + ;; |
1798 | + irix5* | irix6* | nonstopux*) |
1799 | + wl='-Wl,' |
1800 | + ;; |
1801 | + newsos6) |
1802 | + ;; |
1803 | + linux* | k*bsd*-gnu) |
1804 | + case $cc_basename in |
1805 | + ecc*) |
1806 | + wl='-Wl,' |
1807 | + ;; |
1808 | + icc* | ifort*) |
1809 | + wl='-Wl,' |
1810 | + ;; |
1811 | + lf95*) |
1812 | + wl='-Wl,' |
1813 | + ;; |
1814 | + pgcc | pgf77 | pgf90) |
1815 | + wl='-Wl,' |
1816 | + ;; |
1817 | + ccc*) |
1818 | + wl='-Wl,' |
1819 | + ;; |
1820 | + como) |
1821 | + wl='-lopt=' |
1822 | + ;; |
1823 | + *) |
1824 | + case `$CC -V 2>&1 | sed 5q` in |
1825 | + *Sun\ C*) |
1826 | + wl='-Wl,' |
1827 | + ;; |
1828 | + esac |
1829 | + ;; |
1830 | + esac |
1831 | + ;; |
1832 | + osf3* | osf4* | osf5*) |
1833 | + wl='-Wl,' |
1834 | + ;; |
1835 | + rdos*) |
1836 | + ;; |
1837 | + solaris*) |
1838 | + wl='-Wl,' |
1839 | + ;; |
1840 | + sunos4*) |
1841 | + wl='-Qoption ld ' |
1842 | + ;; |
1843 | + sysv4 | sysv4.2uw2* | sysv4.3*) |
1844 | + wl='-Wl,' |
1845 | + ;; |
1846 | + sysv4*MP*) |
1847 | + ;; |
1848 | + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) |
1849 | + wl='-Wl,' |
1850 | + ;; |
1851 | + unicos*) |
1852 | + wl='-Wl,' |
1853 | + ;; |
1854 | + uts4*) |
1855 | + ;; |
1856 | + esac |
1857 | +fi |
1858 | + |
1859 | +# Code taken from libtool.m4's _LT_LINKER_SHLIBS. |
1860 | + |
1861 | +hardcode_libdir_flag_spec= |
1862 | +hardcode_libdir_separator= |
1863 | +hardcode_direct=no |
1864 | +hardcode_minus_L=no |
1865 | + |
1866 | +case "$host_os" in |
1867 | + cygwin* | mingw* | pw32* | cegcc*) |
1868 | + # FIXME: the MSVC++ port hasn't been tested in a loooong time |
1869 | + # When not using gcc, we currently assume that we are using |
1870 | + # Microsoft Visual C++. |
1871 | + if test "$GCC" != yes; then |
1872 | + with_gnu_ld=no |
1873 | + fi |
1874 | + ;; |
1875 | + interix*) |
1876 | + # we just hope/assume this is gcc and not c89 (= MSVC++) |
1877 | + with_gnu_ld=yes |
1878 | + ;; |
1879 | + openbsd*) |
1880 | + with_gnu_ld=no |
1881 | + ;; |
1882 | +esac |
1883 | + |
1884 | +ld_shlibs=yes |
1885 | +if test "$with_gnu_ld" = yes; then |
1886 | + # Set some defaults for GNU ld with shared library support. These |
1887 | + # are reset later if shared libraries are not supported. Putting them |
1888 | + # here allows them to be overridden if necessary. |
1889 | + # Unlike libtool, we use -rpath here, not --rpath, since the documented |
1890 | + # option of GNU ld is called -rpath, not --rpath. |
1891 | + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
1892 | + case "$host_os" in |
1893 | + aix[3-9]*) |
1894 | + # On AIX/PPC, the GNU linker is very broken |
1895 | + if test "$host_cpu" != ia64; then |
1896 | + ld_shlibs=no |
1897 | + fi |
1898 | + ;; |
1899 | + amigaos*) |
1900 | + hardcode_libdir_flag_spec='-L$libdir' |
1901 | + hardcode_minus_L=yes |
1902 | + # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports |
1903 | + # that the semantics of dynamic libraries on AmigaOS, at least up |
1904 | + # to version 4, is to share data among multiple programs linked |
1905 | + # with the same dynamic library. Since this doesn't match the |
1906 | + # behavior of shared libraries on other platforms, we cannot use |
1907 | + # them. |
1908 | + ld_shlibs=no |
1909 | + ;; |
1910 | + beos*) |
1911 | + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
1912 | + : |
1913 | + else |
1914 | + ld_shlibs=no |
1915 | + fi |
1916 | + ;; |
1917 | + cygwin* | mingw* | pw32* | cegcc*) |
1918 | + # hardcode_libdir_flag_spec is actually meaningless, as there is |
1919 | + # no search path for DLLs. |
1920 | + hardcode_libdir_flag_spec='-L$libdir' |
1921 | + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then |
1922 | + : |
1923 | + else |
1924 | + ld_shlibs=no |
1925 | + fi |
1926 | + ;; |
1927 | + interix[3-9]*) |
1928 | + hardcode_direct=no |
1929 | + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' |
1930 | + ;; |
1931 | + gnu* | linux* | k*bsd*-gnu) |
1932 | + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
1933 | + : |
1934 | + else |
1935 | + ld_shlibs=no |
1936 | + fi |
1937 | + ;; |
1938 | + netbsd*) |
1939 | + ;; |
1940 | + solaris*) |
1941 | + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then |
1942 | + ld_shlibs=no |
1943 | + elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
1944 | + : |
1945 | + else |
1946 | + ld_shlibs=no |
1947 | + fi |
1948 | + ;; |
1949 | + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) |
1950 | + case `$LD -v 2>&1` in |
1951 | + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) |
1952 | + ld_shlibs=no |
1953 | + ;; |
1954 | + *) |
1955 | + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
1956 | + hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' |
1957 | + else |
1958 | + ld_shlibs=no |
1959 | + fi |
1960 | + ;; |
1961 | + esac |
1962 | + ;; |
1963 | + sunos4*) |
1964 | + hardcode_direct=yes |
1965 | + ;; |
1966 | + *) |
1967 | + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
1968 | + : |
1969 | + else |
1970 | + ld_shlibs=no |
1971 | + fi |
1972 | + ;; |
1973 | + esac |
1974 | + if test "$ld_shlibs" = no; then |
1975 | + hardcode_libdir_flag_spec= |
1976 | + fi |
1977 | +else |
1978 | + case "$host_os" in |
1979 | + aix3*) |
1980 | + # Note: this linker hardcodes the directories in LIBPATH if there |
1981 | + # are no directories specified by -L. |
1982 | + hardcode_minus_L=yes |
1983 | + if test "$GCC" = yes; then |
1984 | + # Neither direct hardcoding nor static linking is supported with a |
1985 | + # broken collect2. |
1986 | + hardcode_direct=unsupported |
1987 | + fi |
1988 | + ;; |
1989 | + aix[4-9]*) |
1990 | + if test "$host_cpu" = ia64; then |
1991 | + # On IA64, the linker does run time linking by default, so we don't |
1992 | + # have to do anything special. |
1993 | + aix_use_runtimelinking=no |
1994 | + else |
1995 | + aix_use_runtimelinking=no |
1996 | + # Test if we are trying to use run time linking or normal |
1997 | + # AIX style linking. If -brtl is somewhere in LDFLAGS, we |
1998 | + # need to do runtime linking. |
1999 | + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) |
2000 | + for ld_flag in $LDFLAGS; do |
2001 | + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then |
2002 | + aix_use_runtimelinking=yes |
2003 | + break |
2004 | + fi |
2005 | + done |
2006 | + ;; |
2007 | + esac |
2008 | + fi |
2009 | + hardcode_direct=yes |
2010 | + hardcode_libdir_separator=':' |
2011 | + if test "$GCC" = yes; then |
2012 | + case $host_os in aix4.[012]|aix4.[012].*) |
2013 | + collect2name=`${CC} -print-prog-name=collect2` |
2014 | + if test -f "$collect2name" && \ |
2015 | + strings "$collect2name" | grep resolve_lib_name >/dev/null |
2016 | + then |
2017 | + # We have reworked collect2 |
2018 | + : |
2019 | + else |
2020 | + # We have old collect2 |
2021 | + hardcode_direct=unsupported |
2022 | + hardcode_minus_L=yes |
2023 | + hardcode_libdir_flag_spec='-L$libdir' |
2024 | + hardcode_libdir_separator= |
2025 | + fi |
2026 | + ;; |
2027 | + esac |
2028 | + fi |
2029 | + # Begin _LT_AC_SYS_LIBPATH_AIX. |
2030 | + echo 'int main () { return 0; }' > conftest.c |
2031 | + ${CC} ${LDFLAGS} conftest.c -o conftest |
2032 | + aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } |
2033 | +}'` |
2034 | + if test -z "$aix_libpath"; then |
2035 | + aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } |
2036 | +}'` |
2037 | + fi |
2038 | + if test -z "$aix_libpath"; then |
2039 | + aix_libpath="/usr/lib:/lib" |
2040 | + fi |
2041 | + rm -f conftest.c conftest |
2042 | + # End _LT_AC_SYS_LIBPATH_AIX. |
2043 | + if test "$aix_use_runtimelinking" = yes; then |
2044 | + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
2045 | + else |
2046 | + if test "$host_cpu" = ia64; then |
2047 | + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' |
2048 | + else |
2049 | + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
2050 | + fi |
2051 | + fi |
2052 | + ;; |
2053 | + amigaos*) |
2054 | + hardcode_libdir_flag_spec='-L$libdir' |
2055 | + hardcode_minus_L=yes |
2056 | + # see comment about different semantics on the GNU ld section |
2057 | + ld_shlibs=no |
2058 | + ;; |
2059 | + bsdi[45]*) |
2060 | + ;; |
2061 | + cygwin* | mingw* | pw32* | cegcc*) |
2062 | + # When not using gcc, we currently assume that we are using |
2063 | + # Microsoft Visual C++. |
2064 | + # hardcode_libdir_flag_spec is actually meaningless, as there is |
2065 | + # no search path for DLLs. |
2066 | + hardcode_libdir_flag_spec=' ' |
2067 | + libext=lib |
2068 | + ;; |
2069 | + darwin* | rhapsody*) |
2070 | + hardcode_direct=no |
2071 | + if test "$GCC" = yes ; then |
2072 | + : |
2073 | + else |
2074 | + case $cc_basename in |
2075 | + xlc*) |
2076 | + ;; |
2077 | + *) |
2078 | + ld_shlibs=no |
2079 | + ;; |
2080 | + esac |
2081 | + fi |
2082 | + ;; |
2083 | + dgux*) |
2084 | + hardcode_libdir_flag_spec='-L$libdir' |
2085 | + ;; |
2086 | + freebsd1*) |
2087 | + ld_shlibs=no |
2088 | + ;; |
2089 | + freebsd2.2*) |
2090 | + hardcode_libdir_flag_spec='-R$libdir' |
2091 | + hardcode_direct=yes |
2092 | + ;; |
2093 | + freebsd2*) |
2094 | + hardcode_direct=yes |
2095 | + hardcode_minus_L=yes |
2096 | + ;; |
2097 | + freebsd* | dragonfly*) |
2098 | + hardcode_libdir_flag_spec='-R$libdir' |
2099 | + hardcode_direct=yes |
2100 | + ;; |
2101 | + hpux9*) |
2102 | + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' |
2103 | + hardcode_libdir_separator=: |
2104 | + hardcode_direct=yes |
2105 | + # hardcode_minus_L: Not really in the search PATH, |
2106 | + # but as the default location of the library. |
2107 | + hardcode_minus_L=yes |
2108 | + ;; |
2109 | + hpux10*) |
2110 | + if test "$with_gnu_ld" = no; then |
2111 | + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' |
2112 | + hardcode_libdir_separator=: |
2113 | + hardcode_direct=yes |
2114 | + # hardcode_minus_L: Not really in the search PATH, |
2115 | + # but as the default location of the library. |
2116 | + hardcode_minus_L=yes |
2117 | + fi |
2118 | + ;; |
2119 | + hpux11*) |
2120 | + if test "$with_gnu_ld" = no; then |
2121 | + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' |
2122 | + hardcode_libdir_separator=: |
2123 | + case $host_cpu in |
2124 | + hppa*64*|ia64*) |
2125 | + hardcode_direct=no |
2126 | + ;; |
2127 | + *) |
2128 | + hardcode_direct=yes |
2129 | + # hardcode_minus_L: Not really in the search PATH, |
2130 | + # but as the default location of the library. |
2131 | + hardcode_minus_L=yes |
2132 | + ;; |
2133 | + esac |
2134 | + fi |
2135 | + ;; |
2136 | + irix5* | irix6* | nonstopux*) |
2137 | + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
2138 | + hardcode_libdir_separator=: |
2139 | + ;; |
2140 | + netbsd*) |
2141 | + hardcode_libdir_flag_spec='-R$libdir' |
2142 | + hardcode_direct=yes |
2143 | + ;; |
2144 | + newsos6) |
2145 | + hardcode_direct=yes |
2146 | + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
2147 | + hardcode_libdir_separator=: |
2148 | + ;; |
2149 | + openbsd*) |
2150 | + if test -f /usr/libexec/ld.so; then |
2151 | + hardcode_direct=yes |
2152 | + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
2153 | + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' |
2154 | + else |
2155 | + case "$host_os" in |
2156 | + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) |
2157 | + hardcode_libdir_flag_spec='-R$libdir' |
2158 | + ;; |
2159 | + *) |
2160 | + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' |
2161 | + ;; |
2162 | + esac |
2163 | + fi |
2164 | + else |
2165 | + ld_shlibs=no |
2166 | + fi |
2167 | + ;; |
2168 | + os2*) |
2169 | + hardcode_libdir_flag_spec='-L$libdir' |
2170 | + hardcode_minus_L=yes |
2171 | + ;; |
2172 | + osf3*) |
2173 | + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
2174 | + hardcode_libdir_separator=: |
2175 | + ;; |
2176 | + osf4* | osf5*) |
2177 | + if test "$GCC" = yes; then |
2178 | + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
2179 | + else |
2180 | + # Both cc and cxx compiler support -rpath directly |
2181 | + hardcode_libdir_flag_spec='-rpath $libdir' |
2182 | + fi |
2183 | + hardcode_libdir_separator=: |
2184 | + ;; |
2185 | + solaris*) |
2186 | + hardcode_libdir_flag_spec='-R$libdir' |
2187 | + ;; |
2188 | + sunos4*) |
2189 | + hardcode_libdir_flag_spec='-L$libdir' |
2190 | + hardcode_direct=yes |
2191 | + hardcode_minus_L=yes |
2192 | + ;; |
2193 | + sysv4) |
2194 | + case $host_vendor in |
2195 | + sni) |
2196 | + hardcode_direct=yes # is this really true??? |
2197 | + ;; |
2198 | + siemens) |
2199 | + hardcode_direct=no |
2200 | + ;; |
2201 | + motorola) |
2202 | + hardcode_direct=no #Motorola manual says yes, but my tests say they lie |
2203 | + ;; |
2204 | + esac |
2205 | + ;; |
2206 | + sysv4.3*) |
2207 | + ;; |
2208 | + sysv4*MP*) |
2209 | + if test -d /usr/nec; then |
2210 | + ld_shlibs=yes |
2211 | + fi |
2212 | + ;; |
2213 | + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) |
2214 | + ;; |
2215 | + sysv5* | sco3.2v5* | sco5v6*) |
2216 | + hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' |
2217 | + hardcode_libdir_separator=':' |
2218 | + ;; |
2219 | + uts4*) |
2220 | + hardcode_libdir_flag_spec='-L$libdir' |
2221 | + ;; |
2222 | + *) |
2223 | + ld_shlibs=no |
2224 | + ;; |
2225 | + esac |
2226 | +fi |
2227 | + |
2228 | +# Check dynamic linker characteristics |
2229 | +# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER. |
2230 | +# Unlike libtool.m4, here we don't care about _all_ names of the library, but |
2231 | +# only about the one the linker finds when passed -lNAME. This is the last |
2232 | +# element of library_names_spec in libtool.m4, or possibly two of them if the |
2233 | +# linker has special search rules. |
2234 | +library_names_spec= # the last element of library_names_spec in libtool.m4 |
2235 | +libname_spec='lib$name' |
2236 | +case "$host_os" in |
2237 | + aix3*) |
2238 | + library_names_spec='$libname.a' |
2239 | + ;; |
2240 | + aix[4-9]*) |
2241 | + library_names_spec='$libname$shrext' |
2242 | + ;; |
2243 | + amigaos*) |
2244 | + library_names_spec='$libname.a' |
2245 | + ;; |
2246 | + beos*) |
2247 | + library_names_spec='$libname$shrext' |
2248 | + ;; |
2249 | + bsdi[45]*) |
2250 | + library_names_spec='$libname$shrext' |
2251 | + ;; |
2252 | + cygwin* | mingw* | pw32* | cegcc*) |
2253 | + shrext=.dll |
2254 | + library_names_spec='$libname.dll.a $libname.lib' |
2255 | + ;; |
2256 | + darwin* | rhapsody*) |
2257 | + shrext=.dylib |
2258 | + library_names_spec='$libname$shrext' |
2259 | + ;; |
2260 | + dgux*) |
2261 | + library_names_spec='$libname$shrext' |
2262 | + ;; |
2263 | + freebsd1*) |
2264 | + ;; |
2265 | + freebsd* | dragonfly*) |
2266 | + case "$host_os" in |
2267 | + freebsd[123]*) |
2268 | + library_names_spec='$libname$shrext$versuffix' ;; |
2269 | + *) |
2270 | + library_names_spec='$libname$shrext' ;; |
2271 | + esac |
2272 | + ;; |
2273 | + gnu*) |
2274 | + library_names_spec='$libname$shrext' |
2275 | + ;; |
2276 | + hpux9* | hpux10* | hpux11*) |
2277 | + case $host_cpu in |
2278 | + ia64*) |
2279 | + shrext=.so |
2280 | + ;; |
2281 | + hppa*64*) |
2282 | + shrext=.sl |
2283 | + ;; |
2284 | + *) |
2285 | + shrext=.sl |
2286 | + ;; |
2287 | + esac |
2288 | + library_names_spec='$libname$shrext' |
2289 | + ;; |
2290 | + interix[3-9]*) |
2291 | + library_names_spec='$libname$shrext' |
2292 | + ;; |
2293 | + irix5* | irix6* | nonstopux*) |
2294 | + library_names_spec='$libname$shrext' |
2295 | + case "$host_os" in |
2296 | + irix5* | nonstopux*) |
2297 | + libsuff= shlibsuff= |
2298 | + ;; |
2299 | + *) |
2300 | + case $LD in |
2301 | + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;; |
2302 | + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;; |
2303 | + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;; |
2304 | + *) libsuff= shlibsuff= ;; |
2305 | + esac |
2306 | + ;; |
2307 | + esac |
2308 | + ;; |
2309 | + linux*oldld* | linux*aout* | linux*coff*) |
2310 | + ;; |
2311 | + linux* | k*bsd*-gnu) |
2312 | + library_names_spec='$libname$shrext' |
2313 | + ;; |
2314 | + knetbsd*-gnu) |
2315 | + library_names_spec='$libname$shrext' |
2316 | + ;; |
2317 | + netbsd*) |
2318 | + library_names_spec='$libname$shrext' |
2319 | + ;; |
2320 | + newsos6) |
2321 | + library_names_spec='$libname$shrext' |
2322 | + ;; |
2323 | + nto-qnx*) |
2324 | + library_names_spec='$libname$shrext' |
2325 | + ;; |
2326 | + openbsd*) |
2327 | + library_names_spec='$libname$shrext$versuffix' |
2328 | + ;; |
2329 | + os2*) |
2330 | + libname_spec='$name' |
2331 | + shrext=.dll |
2332 | + library_names_spec='$libname.a' |
2333 | + ;; |
2334 | + osf3* | osf4* | osf5*) |
2335 | + library_names_spec='$libname$shrext' |
2336 | + ;; |
2337 | + rdos*) |
2338 | + ;; |
2339 | + solaris*) |
2340 | + library_names_spec='$libname$shrext' |
2341 | + ;; |
2342 | + sunos4*) |
2343 | + library_names_spec='$libname$shrext$versuffix' |
2344 | + ;; |
2345 | + sysv4 | sysv4.3*) |
2346 | + library_names_spec='$libname$shrext' |
2347 | + ;; |
2348 | + sysv4*MP*) |
2349 | + library_names_spec='$libname$shrext' |
2350 | + ;; |
2351 | + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) |
2352 | + library_names_spec='$libname$shrext' |
2353 | + ;; |
2354 | + uts4*) |
2355 | + library_names_spec='$libname$shrext' |
2356 | + ;; |
2357 | +esac |
2358 | + |
2359 | +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' |
2360 | +escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` |
2361 | +shlibext=`echo "$shrext" | sed -e 's,^\.,,'` |
2362 | +escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` |
2363 | +escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` |
2364 | +escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` |
2365 | + |
2366 | +LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF |
2367 | + |
2368 | +# How to pass a linker flag through the compiler. |
2369 | +wl="$escaped_wl" |
2370 | + |
2371 | +# Static library suffix (normally "a"). |
2372 | +libext="$libext" |
2373 | + |
2374 | +# Shared library suffix (normally "so"). |
2375 | +shlibext="$shlibext" |
2376 | + |
2377 | +# Format of library name prefix. |
2378 | +libname_spec="$escaped_libname_spec" |
2379 | + |
2380 | +# Library names that the linker finds when passed -lNAME. |
2381 | +library_names_spec="$escaped_library_names_spec" |
2382 | + |
2383 | +# Flag to hardcode \$libdir into a binary during linking. |
2384 | +# This must work even if \$libdir does not exist. |
2385 | +hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec" |
2386 | + |
2387 | +# Whether we need a single -rpath flag with a separated argument. |
2388 | +hardcode_libdir_separator="$hardcode_libdir_separator" |
2389 | + |
2390 | +# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the |
2391 | +# resulting binary. |
2392 | +hardcode_direct="$hardcode_direct" |
2393 | + |
2394 | +# Set to yes if using the -LDIR flag during linking hardcodes DIR into the |
2395 | +# resulting binary. |
2396 | +hardcode_minus_L="$hardcode_minus_L" |
2397 | + |
2398 | +EOF |
2399 | |
2400 | === modified file 'configure' |
2401 | --- configure 2010-09-05 21:13:36 +0000 |
2402 | +++ configure 2011-01-24 16:22:16 +0000 |
2403 | @@ -1,13 +1,13 @@ |
2404 | #! /bin/sh |
2405 | # Guess values for system-dependent variables and create Makefiles. |
2406 | -# Generated by GNU Autoconf 2.65 for evolution-rss 0.2.0. |
2407 | +# Generated by GNU Autoconf 2.66 for evolution-rss 0.2.2. |
2408 | # |
2409 | # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-rss>. |
2410 | # |
2411 | # |
2412 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
2413 | -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
2414 | -# Inc. |
2415 | +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software |
2416 | +# Foundation, Inc. |
2417 | # |
2418 | # |
2419 | # This configure script is free software; the Free Software Foundation |
2420 | @@ -173,7 +173,15 @@ |
2421 | as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO |
2422 | eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && |
2423 | test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 |
2424 | -test \$(( 1 + 1 )) = 2 || exit 1" |
2425 | +test \$(( 1 + 1 )) = 2 || exit 1 |
2426 | + |
2427 | + test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( |
2428 | + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
2429 | + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO |
2430 | + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO |
2431 | + PATH=/empty FPATH=/empty; export PATH FPATH |
2432 | + test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ |
2433 | + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1" |
2434 | if (eval "$as_required") 2>/dev/null; then : |
2435 | as_have_required=yes |
2436 | else |
2437 | @@ -320,7 +328,7 @@ |
2438 | test -d "$as_dir" && break |
2439 | done |
2440 | test -z "$as_dirs" || eval "mkdir $as_dirs" |
2441 | - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" |
2442 | + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" |
2443 | |
2444 | |
2445 | } # as_fn_mkdir_p |
2446 | @@ -360,19 +368,19 @@ |
2447 | fi # as_fn_arith |
2448 | |
2449 | |
2450 | -# as_fn_error ERROR [LINENO LOG_FD] |
2451 | -# --------------------------------- |
2452 | +# as_fn_error STATUS ERROR [LINENO LOG_FD] |
2453 | +# ---------------------------------------- |
2454 | # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are |
2455 | # provided, also output the error to LOG_FD, referencing LINENO. Then exit the |
2456 | -# script with status $?, using 1 if that was 0. |
2457 | +# script with STATUS, using 1 if that was 0. |
2458 | as_fn_error () |
2459 | { |
2460 | - as_status=$?; test $as_status -eq 0 && as_status=1 |
2461 | - if test "$3"; then |
2462 | - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
2463 | - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 |
2464 | + as_status=$1; test $as_status -eq 0 && as_status=1 |
2465 | + if test "$4"; then |
2466 | + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
2467 | + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 |
2468 | fi |
2469 | - $as_echo "$as_me: error: $1" >&2 |
2470 | + $as_echo "$as_me: error: $2" >&2 |
2471 | as_fn_exit $as_status |
2472 | } # as_fn_error |
2473 | |
2474 | @@ -529,161 +537,14 @@ |
2475 | # Sed expression to map a string onto a valid variable name. |
2476 | as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" |
2477 | |
2478 | - |
2479 | - |
2480 | -# Check that we are running under the correct shell. |
2481 | SHELL=${CONFIG_SHELL-/bin/sh} |
2482 | |
2483 | -case X$lt_ECHO in |
2484 | -X*--fallback-echo) |
2485 | - # Remove one level of quotation (which was required for Make). |
2486 | - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` |
2487 | - ;; |
2488 | -esac |
2489 | - |
2490 | -ECHO=${lt_ECHO-echo} |
2491 | -if test "X$1" = X--no-reexec; then |
2492 | - # Discard the --no-reexec flag, and continue. |
2493 | - shift |
2494 | -elif test "X$1" = X--fallback-echo; then |
2495 | - # Avoid inline document here, it may be left over |
2496 | - : |
2497 | -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then |
2498 | - # Yippee, $ECHO works! |
2499 | - : |
2500 | -else |
2501 | - # Restart under the correct shell. |
2502 | - exec $SHELL "$0" --no-reexec ${1+"$@"} |
2503 | -fi |
2504 | - |
2505 | -if test "X$1" = X--fallback-echo; then |
2506 | - # used as fallback echo |
2507 | - shift |
2508 | - cat <<_LT_EOF |
2509 | -$* |
2510 | -_LT_EOF |
2511 | - exit 0 |
2512 | -fi |
2513 | - |
2514 | -# The HP-UX ksh and POSIX shell print the target directory to stdout |
2515 | -# if CDPATH is set. |
2516 | -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
2517 | - |
2518 | -if test -z "$lt_ECHO"; then |
2519 | - if test "X${echo_test_string+set}" != Xset; then |
2520 | - # find a string as large as possible, as long as the shell can cope with it |
2521 | - for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do |
2522 | - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... |
2523 | - if { echo_test_string=`eval $cmd`; } 2>/dev/null && |
2524 | - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null |
2525 | - then |
2526 | - break |
2527 | - fi |
2528 | - done |
2529 | - fi |
2530 | - |
2531 | - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && |
2532 | - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && |
2533 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2534 | - : |
2535 | - else |
2536 | - # The Solaris, AIX, and Digital Unix default echo programs unquote |
2537 | - # backslashes. This makes it impossible to quote backslashes using |
2538 | - # echo "$something" | sed 's/\\/\\\\/g' |
2539 | - # |
2540 | - # So, first we look for a working echo in the user's PATH. |
2541 | - |
2542 | - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
2543 | - for dir in $PATH /usr/ucb; do |
2544 | - IFS="$lt_save_ifs" |
2545 | - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && |
2546 | - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && |
2547 | - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && |
2548 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2549 | - ECHO="$dir/echo" |
2550 | - break |
2551 | - fi |
2552 | - done |
2553 | - IFS="$lt_save_ifs" |
2554 | - |
2555 | - if test "X$ECHO" = Xecho; then |
2556 | - # We didn't find a better echo, so look for alternatives. |
2557 | - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && |
2558 | - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && |
2559 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2560 | - # This shell has a builtin print -r that does the trick. |
2561 | - ECHO='print -r' |
2562 | - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && |
2563 | - test "X$CONFIG_SHELL" != X/bin/ksh; then |
2564 | - # If we have ksh, try running configure again with it. |
2565 | - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} |
2566 | - export ORIGINAL_CONFIG_SHELL |
2567 | - CONFIG_SHELL=/bin/ksh |
2568 | - export CONFIG_SHELL |
2569 | - exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} |
2570 | - else |
2571 | - # Try using printf. |
2572 | - ECHO='printf %s\n' |
2573 | - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && |
2574 | - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && |
2575 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2576 | - # Cool, printf works |
2577 | - : |
2578 | - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && |
2579 | - test "X$echo_testing_string" = 'X\t' && |
2580 | - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
2581 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2582 | - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL |
2583 | - export CONFIG_SHELL |
2584 | - SHELL="$CONFIG_SHELL" |
2585 | - export SHELL |
2586 | - ECHO="$CONFIG_SHELL $0 --fallback-echo" |
2587 | - elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && |
2588 | - test "X$echo_testing_string" = 'X\t' && |
2589 | - echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
2590 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2591 | - ECHO="$CONFIG_SHELL $0 --fallback-echo" |
2592 | - else |
2593 | - # maybe with a smaller string... |
2594 | - prev=: |
2595 | - |
2596 | - for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do |
2597 | - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null |
2598 | - then |
2599 | - break |
2600 | - fi |
2601 | - prev="$cmd" |
2602 | - done |
2603 | - |
2604 | - if test "$prev" != 'sed 50q "$0"'; then |
2605 | - echo_test_string=`eval $prev` |
2606 | - export echo_test_string |
2607 | - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} |
2608 | - else |
2609 | - # Oops. We lost completely, so just stick with echo. |
2610 | - ECHO=echo |
2611 | - fi |
2612 | - fi |
2613 | - fi |
2614 | - fi |
2615 | - fi |
2616 | -fi |
2617 | - |
2618 | -# Copy echo and quote the copy suitably for passing to libtool from |
2619 | -# the Makefile, instead of quoting the original, which is used later. |
2620 | -lt_ECHO=$ECHO |
2621 | -if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then |
2622 | - lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" |
2623 | -fi |
2624 | - |
2625 | - |
2626 | - |
2627 | |
2628 | test -n "$DJDIR" || exec 7<&0 </dev/null |
2629 | exec 6>&1 |
2630 | |
2631 | # Name of the host. |
2632 | -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, |
2633 | +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, |
2634 | # so uname gets run too. |
2635 | ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` |
2636 | |
2637 | @@ -702,8 +563,8 @@ |
2638 | # Identity of this package. |
2639 | PACKAGE_NAME='evolution-rss' |
2640 | PACKAGE_TARNAME='evolution-rss' |
2641 | -PACKAGE_VERSION='0.2.0' |
2642 | -PACKAGE_STRING='evolution-rss 0.2.0' |
2643 | +PACKAGE_VERSION='0.2.2' |
2644 | +PACKAGE_STRING='evolution-rss 0.2.2' |
2645 | PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-rss' |
2646 | PACKAGE_URL='' |
2647 | |
2648 | @@ -845,6 +706,8 @@ |
2649 | GTKHTML_EDITOR_CFLAGS |
2650 | EVOLUTION_RSS_EPLUGIN_LIBS |
2651 | EVOLUTION_RSS_EPLUGIN_CFLAGS |
2652 | +GTKHTML_LIBS |
2653 | +GTKHTML_CFLAGS |
2654 | LIBSOUP_LIBS |
2655 | LIBSOUP_CFLAGS |
2656 | LIBSOUP_22_LIBS |
2657 | @@ -860,6 +723,8 @@ |
2658 | EVOLUTION_2_12 |
2659 | EVOLUTION_EXEC_VERSION |
2660 | EVOLUTION_VERSION |
2661 | +PKG_CONFIG_LIBDIR |
2662 | +PKG_CONFIG_PATH |
2663 | PKG_CONFIG |
2664 | WARN_CFLAGS |
2665 | CXXCPP |
2666 | @@ -868,7 +733,6 @@ |
2667 | LIPO |
2668 | NMEDIT |
2669 | DSYMUTIL |
2670 | -lt_ECHO |
2671 | RANLIB |
2672 | AR |
2673 | OBJDUMP |
2674 | @@ -1056,12 +920,16 @@ |
2675 | CPP |
2676 | CXXCPP |
2677 | PKG_CONFIG |
2678 | +PKG_CONFIG_PATH |
2679 | +PKG_CONFIG_LIBDIR |
2680 | LIBSOUP_24_CFLAGS |
2681 | LIBSOUP_24_LIBS |
2682 | LIBSOUP_22_CFLAGS |
2683 | LIBSOUP_22_LIBS |
2684 | LIBSOUP_CFLAGS |
2685 | LIBSOUP_LIBS |
2686 | +GTKHTML_CFLAGS |
2687 | +GTKHTML_LIBS |
2688 | EVOLUTION_RSS_EPLUGIN_CFLAGS |
2689 | EVOLUTION_RSS_EPLUGIN_LIBS |
2690 | GTKHTML_EDITOR_CFLAGS |
2691 | @@ -1186,7 +1054,7 @@ |
2692 | ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` |
2693 | # Reject names that are not valid shell variable names. |
2694 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
2695 | - as_fn_error "invalid feature name: $ac_useropt" |
2696 | + as_fn_error $? "invalid feature name: $ac_useropt" |
2697 | ac_useropt_orig=$ac_useropt |
2698 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
2699 | case $ac_user_opts in |
2700 | @@ -1212,7 +1080,7 @@ |
2701 | ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` |
2702 | # Reject names that are not valid shell variable names. |
2703 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
2704 | - as_fn_error "invalid feature name: $ac_useropt" |
2705 | + as_fn_error $? "invalid feature name: $ac_useropt" |
2706 | ac_useropt_orig=$ac_useropt |
2707 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
2708 | case $ac_user_opts in |
2709 | @@ -1416,7 +1284,7 @@ |
2710 | ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` |
2711 | # Reject names that are not valid shell variable names. |
2712 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
2713 | - as_fn_error "invalid package name: $ac_useropt" |
2714 | + as_fn_error $? "invalid package name: $ac_useropt" |
2715 | ac_useropt_orig=$ac_useropt |
2716 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
2717 | case $ac_user_opts in |
2718 | @@ -1432,7 +1300,7 @@ |
2719 | ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` |
2720 | # Reject names that are not valid shell variable names. |
2721 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
2722 | - as_fn_error "invalid package name: $ac_useropt" |
2723 | + as_fn_error $? "invalid package name: $ac_useropt" |
2724 | ac_useropt_orig=$ac_useropt |
2725 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
2726 | case $ac_user_opts in |
2727 | @@ -1462,8 +1330,8 @@ |
2728 | | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) |
2729 | x_libraries=$ac_optarg ;; |
2730 | |
2731 | - -*) as_fn_error "unrecognized option: \`$ac_option' |
2732 | -Try \`$0 --help' for more information." |
2733 | + -*) as_fn_error $? "unrecognized option: \`$ac_option' |
2734 | +Try \`$0 --help' for more information" |
2735 | ;; |
2736 | |
2737 | *=*) |
2738 | @@ -1471,7 +1339,7 @@ |
2739 | # Reject names that are not valid shell variable names. |
2740 | case $ac_envvar in #( |
2741 | '' | [0-9]* | *[!_$as_cr_alnum]* ) |
2742 | - as_fn_error "invalid variable name: \`$ac_envvar'" ;; |
2743 | + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; |
2744 | esac |
2745 | eval $ac_envvar=\$ac_optarg |
2746 | export $ac_envvar ;; |
2747 | @@ -1489,13 +1357,13 @@ |
2748 | |
2749 | if test -n "$ac_prev"; then |
2750 | ac_option=--`echo $ac_prev | sed 's/_/-/g'` |
2751 | - as_fn_error "missing argument to $ac_option" |
2752 | + as_fn_error $? "missing argument to $ac_option" |
2753 | fi |
2754 | |
2755 | if test -n "$ac_unrecognized_opts"; then |
2756 | case $enable_option_checking in |
2757 | no) ;; |
2758 | - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; |
2759 | + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; |
2760 | *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; |
2761 | esac |
2762 | fi |
2763 | @@ -1518,7 +1386,7 @@ |
2764 | [\\/$]* | ?:[\\/]* ) continue;; |
2765 | NONE | '' ) case $ac_var in *prefix ) continue;; esac;; |
2766 | esac |
2767 | - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" |
2768 | + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" |
2769 | done |
2770 | |
2771 | # There might be people who depend on the old broken behavior: `$host' |
2772 | @@ -1532,8 +1400,8 @@ |
2773 | if test "x$host_alias" != x; then |
2774 | if test "x$build_alias" = x; then |
2775 | cross_compiling=maybe |
2776 | - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. |
2777 | - If a cross compiler is detected then cross compile mode will be used." >&2 |
2778 | + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. |
2779 | + If a cross compiler is detected then cross compile mode will be used" >&2 |
2780 | elif test "x$build_alias" != "x$host_alias"; then |
2781 | cross_compiling=yes |
2782 | fi |
2783 | @@ -1548,9 +1416,9 @@ |
2784 | ac_pwd=`pwd` && test -n "$ac_pwd" && |
2785 | ac_ls_di=`ls -di .` && |
2786 | ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || |
2787 | - as_fn_error "working directory cannot be determined" |
2788 | + as_fn_error $? "working directory cannot be determined" |
2789 | test "X$ac_ls_di" = "X$ac_pwd_ls_di" || |
2790 | - as_fn_error "pwd does not report name of working directory" |
2791 | + as_fn_error $? "pwd does not report name of working directory" |
2792 | |
2793 | |
2794 | # Find the source files, if location was not specified. |
2795 | @@ -1589,11 +1457,11 @@ |
2796 | fi |
2797 | if test ! -r "$srcdir/$ac_unique_file"; then |
2798 | test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." |
2799 | - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" |
2800 | + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" |
2801 | fi |
2802 | ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" |
2803 | ac_abs_confdir=`( |
2804 | - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" |
2805 | + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" |
2806 | pwd)` |
2807 | # When building in place, set srcdir=. |
2808 | if test "$ac_abs_confdir" = "$ac_pwd"; then |
2809 | @@ -1619,7 +1487,7 @@ |
2810 | # Omit some internal or obsolete options to make the list less imposing. |
2811 | # This message is too long to be a string in the A/UX 3.1 sh. |
2812 | cat <<_ACEOF |
2813 | -\`configure' configures evolution-rss 0.2.0 to adapt to many kinds of systems. |
2814 | +\`configure' configures evolution-rss 0.2.2 to adapt to many kinds of systems. |
2815 | |
2816 | Usage: $0 [OPTION]... [VAR=VALUE]... |
2817 | |
2818 | @@ -1633,7 +1501,7 @@ |
2819 | --help=short display options specific to this package |
2820 | --help=recursive display the short help of all the included packages |
2821 | -V, --version display version information and exit |
2822 | - -q, --quiet, --silent do not print \`checking...' messages |
2823 | + -q, --quiet, --silent do not print \`checking ...' messages |
2824 | --cache-file=FILE cache test results in FILE [disabled] |
2825 | -C, --config-cache alias for \`--cache-file=config.cache' |
2826 | -n, --no-create do not create output files |
2827 | @@ -1689,7 +1557,7 @@ |
2828 | |
2829 | if test -n "$ac_init_help"; then |
2830 | case $ac_init_help in |
2831 | - short | recursive ) echo "Configuration of evolution-rss 0.2.0:";; |
2832 | + short | recursive ) echo "Configuration of evolution-rss 0.2.2:";; |
2833 | esac |
2834 | cat <<\_ACEOF |
2835 | |
2836 | @@ -1756,6 +1624,10 @@ |
2837 | CPP C preprocessor |
2838 | CXXCPP C++ preprocessor |
2839 | PKG_CONFIG path to pkg-config utility |
2840 | + PKG_CONFIG_PATH |
2841 | + directories to add to pkg-config's search path |
2842 | + PKG_CONFIG_LIBDIR |
2843 | + path overriding pkg-config's built-in search path |
2844 | LIBSOUP_24_CFLAGS |
2845 | C compiler flags for LIBSOUP_24, overriding pkg-config |
2846 | LIBSOUP_24_LIBS |
2847 | @@ -1768,6 +1640,10 @@ |
2848 | C compiler flags for LIBSOUP, overriding pkg-config |
2849 | LIBSOUP_LIBS |
2850 | linker flags for LIBSOUP, overriding pkg-config |
2851 | + GTKHTML_CFLAGS |
2852 | + C compiler flags for GTKHTML, overriding pkg-config |
2853 | + GTKHTML_LIBS |
2854 | + linker flags for GTKHTML, overriding pkg-config |
2855 | EVOLUTION_RSS_EPLUGIN_CFLAGS |
2856 | C compiler flags for EVOLUTION_RSS_EPLUGIN, overriding |
2857 | pkg-config |
2858 | @@ -1864,10 +1740,10 @@ |
2859 | test -n "$ac_init_help" && exit $ac_status |
2860 | if $ac_init_version; then |
2861 | cat <<\_ACEOF |
2862 | -evolution-rss configure 0.2.0 |
2863 | -generated by GNU Autoconf 2.65 |
2864 | +evolution-rss configure 0.2.2 |
2865 | +generated by GNU Autoconf 2.66 |
2866 | |
2867 | -Copyright (C) 2009 Free Software Foundation, Inc. |
2868 | +Copyright (C) 2010 Free Software Foundation, Inc. |
2869 | This configure script is free software; the Free Software Foundation |
2870 | gives unlimited permission to copy, distribute and modify it. |
2871 | _ACEOF |
2872 | @@ -1970,7 +1846,7 @@ |
2873 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
2874 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
2875 | $as_echo_n "checking for $2... " >&6; } |
2876 | -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
2877 | +if eval "test \"\${$3+set}\"" = set; then : |
2878 | $as_echo_n "(cached) " >&6 |
2879 | else |
2880 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2881 | @@ -2155,7 +2031,7 @@ |
2882 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
2883 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
2884 | $as_echo_n "checking for $2... " >&6; } |
2885 | -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
2886 | +if eval "test \"\${$3+set}\"" = set; then : |
2887 | $as_echo_n "(cached) " >&6 |
2888 | else |
2889 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2890 | @@ -2310,10 +2186,10 @@ |
2891 | ac_fn_c_check_header_mongrel () |
2892 | { |
2893 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
2894 | - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
2895 | + if eval "test \"\${$3+set}\"" = set; then : |
2896 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
2897 | $as_echo_n "checking for $2... " >&6; } |
2898 | -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
2899 | +if eval "test \"\${$3+set}\"" = set; then : |
2900 | $as_echo_n "(cached) " >&6 |
2901 | fi |
2902 | eval ac_res=\$$3 |
2903 | @@ -2372,17 +2248,15 @@ |
2904 | $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} |
2905 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 |
2906 | $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} |
2907 | -( cat <<\_ASBOX |
2908 | -## ---------------------------------------------------------------------------- ## |
2909 | +( $as_echo "## ---------------------------------------------------------------------------- ## |
2910 | ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-rss ## |
2911 | -## ---------------------------------------------------------------------------- ## |
2912 | -_ASBOX |
2913 | +## ---------------------------------------------------------------------------- ##" |
2914 | ) | sed "s/^/$as_me: WARNING: /" >&2 |
2915 | ;; |
2916 | esac |
2917 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
2918 | $as_echo_n "checking for $2... " >&6; } |
2919 | -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
2920 | +if eval "test \"\${$3+set}\"" = set; then : |
2921 | $as_echo_n "(cached) " >&6 |
2922 | else |
2923 | eval "$3=\$ac_header_compiler" |
2924 | @@ -2398,8 +2272,8 @@ |
2925 | This file contains any messages produced by compilers while |
2926 | running configure, to aid debugging if configure makes a mistake. |
2927 | |
2928 | -It was created by evolution-rss $as_me 0.2.0, which was |
2929 | -generated by GNU Autoconf 2.65. Invocation command line was |
2930 | +It was created by evolution-rss $as_me 0.2.2, which was |
2931 | +generated by GNU Autoconf 2.66. Invocation command line was |
2932 | |
2933 | $ $0 $@ |
2934 | |
2935 | @@ -2509,11 +2383,9 @@ |
2936 | { |
2937 | echo |
2938 | |
2939 | - cat <<\_ASBOX |
2940 | -## ---------------- ## |
2941 | + $as_echo "## ---------------- ## |
2942 | ## Cache variables. ## |
2943 | -## ---------------- ## |
2944 | -_ASBOX |
2945 | +## ---------------- ##" |
2946 | echo |
2947 | # The following way of writing the cache mishandles newlines in values, |
2948 | ( |
2949 | @@ -2547,11 +2419,9 @@ |
2950 | ) |
2951 | echo |
2952 | |
2953 | - cat <<\_ASBOX |
2954 | -## ----------------- ## |
2955 | + $as_echo "## ----------------- ## |
2956 | ## Output variables. ## |
2957 | -## ----------------- ## |
2958 | -_ASBOX |
2959 | +## ----------------- ##" |
2960 | echo |
2961 | for ac_var in $ac_subst_vars |
2962 | do |
2963 | @@ -2564,11 +2434,9 @@ |
2964 | echo |
2965 | |
2966 | if test -n "$ac_subst_files"; then |
2967 | - cat <<\_ASBOX |
2968 | -## ------------------- ## |
2969 | + $as_echo "## ------------------- ## |
2970 | ## File substitutions. ## |
2971 | -## ------------------- ## |
2972 | -_ASBOX |
2973 | +## ------------------- ##" |
2974 | echo |
2975 | for ac_var in $ac_subst_files |
2976 | do |
2977 | @@ -2582,11 +2450,9 @@ |
2978 | fi |
2979 | |
2980 | if test -s confdefs.h; then |
2981 | - cat <<\_ASBOX |
2982 | -## ----------- ## |
2983 | + $as_echo "## ----------- ## |
2984 | ## confdefs.h. ## |
2985 | -## ----------- ## |
2986 | -_ASBOX |
2987 | +## ----------- ##" |
2988 | echo |
2989 | cat confdefs.h |
2990 | echo |
2991 | @@ -2641,7 +2507,12 @@ |
2992 | ac_site_file1=NONE |
2993 | ac_site_file2=NONE |
2994 | if test -n "$CONFIG_SITE"; then |
2995 | - ac_site_file1=$CONFIG_SITE |
2996 | + # We do not want a PATH search for config.site. |
2997 | + case $CONFIG_SITE in #(( |
2998 | + -*) ac_site_file1=./$CONFIG_SITE;; |
2999 | + */*) ac_site_file1=$CONFIG_SITE;; |
3000 | + *) ac_site_file1=./$CONFIG_SITE;; |
3001 | + esac |
3002 | elif test "x$prefix" != xNONE; then |
3003 | ac_site_file1=$prefix/share/config.site |
3004 | ac_site_file2=$prefix/etc/config.site |
3005 | @@ -2656,7 +2527,11 @@ |
3006 | { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 |
3007 | $as_echo "$as_me: loading site script $ac_site_file" >&6;} |
3008 | sed 's/^/| /' "$ac_site_file" >&5 |
3009 | - . "$ac_site_file" |
3010 | + . "$ac_site_file" \ |
3011 | + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3012 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3013 | +as_fn_error $? "failed to load site script $ac_site_file |
3014 | +See \`config.log' for more details" "$LINENO" 5; } |
3015 | fi |
3016 | done |
3017 | |
3018 | @@ -2732,7 +2607,7 @@ |
3019 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3020 | { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 |
3021 | $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} |
3022 | - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 |
3023 | + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 |
3024 | fi |
3025 | ## -------------------- ## |
3026 | ## Main body of script. ## |
3027 | @@ -2751,16 +2626,22 @@ |
3028 | |
3029 | ac_aux_dir= |
3030 | for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do |
3031 | - for ac_t in install-sh install.sh shtool; do |
3032 | - if test -f "$ac_dir/$ac_t"; then |
3033 | - ac_aux_dir=$ac_dir |
3034 | - ac_install_sh="$ac_aux_dir/$ac_t -c" |
3035 | - break 2 |
3036 | - fi |
3037 | - done |
3038 | + if test -f "$ac_dir/install-sh"; then |
3039 | + ac_aux_dir=$ac_dir |
3040 | + ac_install_sh="$ac_aux_dir/install-sh -c" |
3041 | + break |
3042 | + elif test -f "$ac_dir/install.sh"; then |
3043 | + ac_aux_dir=$ac_dir |
3044 | + ac_install_sh="$ac_aux_dir/install.sh -c" |
3045 | + break |
3046 | + elif test -f "$ac_dir/shtool"; then |
3047 | + ac_aux_dir=$ac_dir |
3048 | + ac_install_sh="$ac_aux_dir/shtool install -c" |
3049 | + break |
3050 | + fi |
3051 | done |
3052 | if test -z "$ac_aux_dir"; then |
3053 | - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 |
3054 | + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 |
3055 | fi |
3056 | |
3057 | # These three variables are undocumented and unsupported, |
3058 | @@ -2876,11 +2757,11 @@ |
3059 | ' |
3060 | case `pwd` in |
3061 | *[\\\"\#\$\&\'\`$am_lf]*) |
3062 | - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; |
3063 | + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; |
3064 | esac |
3065 | case $srcdir in |
3066 | *[\\\"\#\$\&\'\`$am_lf\ \ ]*) |
3067 | - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; |
3068 | + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; |
3069 | esac |
3070 | |
3071 | # Do `set' in a subshell so we don't clobber the current shell's |
3072 | @@ -2902,7 +2783,7 @@ |
3073 | # if, for instance, CONFIG_SHELL is bash and it inherits a |
3074 | # broken ls alias from the environment. This has actually |
3075 | # happened. Such a system could not be considered "sane". |
3076 | - as_fn_error "ls -t appears to fail. Make sure there is not a broken |
3077 | + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken |
3078 | alias in your environment" "$LINENO" 5 |
3079 | fi |
3080 | |
3081 | @@ -2912,7 +2793,7 @@ |
3082 | # Ok. |
3083 | : |
3084 | else |
3085 | - as_fn_error "newly created file is older than distributed files! |
3086 | + as_fn_error $? "newly created file is older than distributed files! |
3087 | Check your system clock" "$LINENO" 5 |
3088 | fi |
3089 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
3090 | @@ -3150,7 +3031,7 @@ |
3091 | $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } |
3092 | set x ${MAKE-make} |
3093 | ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` |
3094 | -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : |
3095 | +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : |
3096 | $as_echo_n "(cached) " >&6 |
3097 | else |
3098 | cat >conftest.make <<\_ACEOF |
3099 | @@ -3158,7 +3039,7 @@ |
3100 | all: |
3101 | @echo '@@@%%%=$(MAKE)=@@@%%%' |
3102 | _ACEOF |
3103 | -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. |
3104 | +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. |
3105 | case `${MAKE-make} -f conftest.make 2>/dev/null` in |
3106 | *@@@%%%=?*=@@@%%%*) |
3107 | eval ac_cv_prog_make_${ac_make}_set=yes;; |
3108 | @@ -3192,7 +3073,7 @@ |
3109 | am__isrc=' -I$(srcdir)' |
3110 | # test to see if srcdir already configured |
3111 | if test -f $srcdir/config.status; then |
3112 | - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 |
3113 | + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 |
3114 | fi |
3115 | fi |
3116 | |
3117 | @@ -3208,7 +3089,7 @@ |
3118 | |
3119 | # Define the identity of the package. |
3120 | PACKAGE='evolution-rss' |
3121 | - VERSION='0.2.0' |
3122 | + VERSION='0.2.2' |
3123 | |
3124 | |
3125 | cat >>confdefs.h <<_ACEOF |
3126 | @@ -3626,8 +3507,8 @@ |
3127 | |
3128 | test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3129 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3130 | -as_fn_error "no acceptable C compiler found in \$PATH |
3131 | -See \`config.log' for more details." "$LINENO" 5; } |
3132 | +as_fn_error $? "no acceptable C compiler found in \$PATH |
3133 | +See \`config.log' for more details" "$LINENO" 5; } |
3134 | |
3135 | # Provide some information about the compiler. |
3136 | $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 |
3137 | @@ -3741,9 +3622,8 @@ |
3138 | |
3139 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3140 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3141 | -{ as_fn_set_status 77 |
3142 | -as_fn_error "C compiler cannot create executables |
3143 | -See \`config.log' for more details." "$LINENO" 5; }; } |
3144 | +as_fn_error 77 "C compiler cannot create executables |
3145 | +See \`config.log' for more details" "$LINENO" 5; } |
3146 | else |
3147 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
3148 | $as_echo "yes" >&6; } |
3149 | @@ -3785,8 +3665,8 @@ |
3150 | else |
3151 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3152 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3153 | -as_fn_error "cannot compute suffix of executables: cannot compile and link |
3154 | -See \`config.log' for more details." "$LINENO" 5; } |
3155 | +as_fn_error $? "cannot compute suffix of executables: cannot compile and link |
3156 | +See \`config.log' for more details" "$LINENO" 5; } |
3157 | fi |
3158 | rm -f conftest conftest$ac_cv_exeext |
3159 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 |
3160 | @@ -3843,9 +3723,9 @@ |
3161 | else |
3162 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3163 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3164 | -as_fn_error "cannot run C compiled programs. |
3165 | +as_fn_error $? "cannot run C compiled programs. |
3166 | If you meant to cross compile, use \`--host'. |
3167 | -See \`config.log' for more details." "$LINENO" 5; } |
3168 | +See \`config.log' for more details" "$LINENO" 5; } |
3169 | fi |
3170 | fi |
3171 | fi |
3172 | @@ -3896,8 +3776,8 @@ |
3173 | |
3174 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3175 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3176 | -as_fn_error "cannot compute suffix of object files: cannot compile |
3177 | -See \`config.log' for more details." "$LINENO" 5; } |
3178 | +as_fn_error $? "cannot compute suffix of object files: cannot compile |
3179 | +See \`config.log' for more details" "$LINENO" 5; } |
3180 | fi |
3181 | rm -f conftest.$ac_cv_objext conftest.$ac_ext |
3182 | fi |
3183 | @@ -4312,7 +4192,7 @@ |
3184 | |
3185 | # Make sure we can run config.sub. |
3186 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || |
3187 | - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 |
3188 | + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 |
3189 | |
3190 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 |
3191 | $as_echo_n "checking build system type... " >&6; } |
3192 | @@ -4323,16 +4203,16 @@ |
3193 | test "x$ac_build_alias" = x && |
3194 | ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` |
3195 | test "x$ac_build_alias" = x && |
3196 | - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 |
3197 | + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 |
3198 | ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || |
3199 | - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 |
3200 | + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 |
3201 | |
3202 | fi |
3203 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 |
3204 | $as_echo "$ac_cv_build" >&6; } |
3205 | case $ac_cv_build in |
3206 | *-*-*) ;; |
3207 | -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; |
3208 | +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; |
3209 | esac |
3210 | build=$ac_cv_build |
3211 | ac_save_IFS=$IFS; IFS='-' |
3212 | @@ -4357,7 +4237,7 @@ |
3213 | ac_cv_host=$ac_cv_build |
3214 | else |
3215 | ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || |
3216 | - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 |
3217 | + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 |
3218 | fi |
3219 | |
3220 | fi |
3221 | @@ -4365,7 +4245,7 @@ |
3222 | $as_echo "$ac_cv_host" >&6; } |
3223 | case $ac_cv_host in |
3224 | *-*-*) ;; |
3225 | -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; |
3226 | +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; |
3227 | esac |
3228 | host=$ac_cv_host |
3229 | ac_save_IFS=$IFS; IFS='-' |
3230 | @@ -4427,7 +4307,7 @@ |
3231 | |
3232 | case "$am__api_version" in |
3233 | 1.01234) |
3234 | - as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 |
3235 | + as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 |
3236 | ;; |
3237 | *) |
3238 | ;; |
3239 | @@ -4444,7 +4324,7 @@ |
3240 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 |
3241 | $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } |
3242 | test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || |
3243 | - as_fn_error "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 |
3244 | + as_fn_error $? "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 |
3245 | fi |
3246 | |
3247 | # Extract the first word of "intltool-update", so it can be a program name with args. |
3248 | @@ -4568,7 +4448,7 @@ |
3249 | |
3250 | |
3251 | if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then |
3252 | - as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5 |
3253 | + as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 |
3254 | fi |
3255 | |
3256 | INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
3257 | @@ -4850,13 +4730,13 @@ |
3258 | |
3259 | |
3260 | if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then |
3261 | - as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 |
3262 | + as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 |
3263 | fi |
3264 | xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" |
3265 | mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" |
3266 | mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" |
3267 | if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then |
3268 | - as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 |
3269 | + as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 |
3270 | fi |
3271 | |
3272 | # Extract the first word of "perl", so it can be a program name with args. |
3273 | @@ -4900,13 +4780,13 @@ |
3274 | |
3275 | |
3276 | if test -z "$INTLTOOL_PERL"; then |
3277 | - as_fn_error "perl not found" "$LINENO" 5 |
3278 | + as_fn_error $? "perl not found" "$LINENO" 5 |
3279 | fi |
3280 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 |
3281 | $as_echo_n "checking for perl >= 5.8.1... " >&6; } |
3282 | $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 |
3283 | if test $? -ne 0; then |
3284 | - as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5 |
3285 | + as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 |
3286 | else |
3287 | IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" |
3288 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 |
3289 | @@ -4919,7 +4799,7 @@ |
3290 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 |
3291 | $as_echo "ok" >&6; } |
3292 | else |
3293 | - as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5 |
3294 | + as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5 |
3295 | fi |
3296 | fi |
3297 | |
3298 | @@ -5268,8 +5148,8 @@ |
3299 | |
3300 | test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3301 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3302 | -as_fn_error "no acceptable C compiler found in \$PATH |
3303 | -See \`config.log' for more details." "$LINENO" 5; } |
3304 | +as_fn_error $? "no acceptable C compiler found in \$PATH |
3305 | +See \`config.log' for more details" "$LINENO" 5; } |
3306 | |
3307 | # Provide some information about the compiler. |
3308 | $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 |
3309 | @@ -5644,7 +5524,7 @@ |
3310 | fi |
3311 | set dummy $CC; ac_cc=`$as_echo "$2" | |
3312 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` |
3313 | -if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : |
3314 | +if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then : |
3315 | $as_echo_n "(cached) " >&6 |
3316 | else |
3317 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3318 | @@ -6272,8 +6152,8 @@ |
3319 | else |
3320 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3321 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3322 | -as_fn_error "C preprocessor \"$CPP\" fails sanity check |
3323 | -See \`config.log' for more details." "$LINENO" 5; } |
3324 | +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check |
3325 | +See \`config.log' for more details" "$LINENO" 5; } |
3326 | fi |
3327 | |
3328 | ac_ext=c |
3329 | @@ -6326,7 +6206,7 @@ |
3330 | |
3331 | |
3332 | if test "x$GPP" = "xno"; then |
3333 | - as_fn_error "C++ Compiler (g++) not installed" "$LINENO" 5 |
3334 | + as_fn_error $? "C++ Compiler (g++) not installed" "$LINENO" 5 |
3335 | fi |
3336 | #AC_PROG_CXXCPP |
3337 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 |
3338 | @@ -6436,7 +6316,7 @@ |
3339 | done |
3340 | IFS=$as_save_IFS |
3341 | if test -z "$ac_cv_path_GREP"; then |
3342 | - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
3343 | + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
3344 | fi |
3345 | else |
3346 | ac_cv_path_GREP=$GREP |
3347 | @@ -6502,7 +6382,7 @@ |
3348 | done |
3349 | IFS=$as_save_IFS |
3350 | if test -z "$ac_cv_path_EGREP"; then |
3351 | - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
3352 | + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
3353 | fi |
3354 | else |
3355 | ac_cv_path_EGREP=$EGREP |
3356 | @@ -6666,8 +6546,8 @@ |
3357 | |
3358 | |
3359 | |
3360 | -macro_version='2.2.6b' |
3361 | -macro_revision='1.3017' |
3362 | +macro_version='2.2.10' |
3363 | +macro_revision='1.3175' |
3364 | |
3365 | |
3366 | |
3367 | @@ -6683,6 +6563,75 @@ |
3368 | |
3369 | ltmain="$ac_aux_dir/ltmain.sh" |
3370 | |
3371 | +# Backslashify metacharacters that are still active within |
3372 | +# double-quoted strings. |
3373 | +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' |
3374 | + |
3375 | +# Same as above, but do not quote variable references. |
3376 | +double_quote_subst='s/\(["`\\]\)/\\\1/g' |
3377 | + |
3378 | +# Sed substitution to delay expansion of an escaped shell variable in a |
3379 | +# double_quote_subst'ed string. |
3380 | +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' |
3381 | + |
3382 | +# Sed substitution to delay expansion of an escaped single quote. |
3383 | +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' |
3384 | + |
3385 | +# Sed substitution to avoid accidental globbing in evaled expressions |
3386 | +no_glob_subst='s/\*/\\\*/g' |
3387 | + |
3388 | +ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
3389 | +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO |
3390 | +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
3391 | + |
3392 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
3393 | +$as_echo_n "checking how to print strings... " >&6; } |
3394 | +# Test print first, because it will be a builtin if present. |
3395 | +if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
3396 | + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
3397 | + ECHO='print -r --' |
3398 | +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
3399 | + ECHO='printf %s\n' |
3400 | +else |
3401 | + # Use this function as a fallback that always works. |
3402 | + func_fallback_echo () |
3403 | + { |
3404 | + eval 'cat <<_LTECHO_EOF |
3405 | +$1 |
3406 | +_LTECHO_EOF' |
3407 | + } |
3408 | + ECHO='func_fallback_echo' |
3409 | +fi |
3410 | + |
3411 | +# func_echo_all arg... |
3412 | +# Invoke $ECHO with all args, space-separated. |
3413 | +func_echo_all () |
3414 | +{ |
3415 | + $ECHO "" |
3416 | +} |
3417 | + |
3418 | +case "$ECHO" in |
3419 | + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 |
3420 | +$as_echo "printf" >&6; } ;; |
3421 | + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 |
3422 | +$as_echo "print -r" >&6; } ;; |
3423 | + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 |
3424 | +$as_echo "cat" >&6; } ;; |
3425 | +esac |
3426 | + |
3427 | + |
3428 | + |
3429 | + |
3430 | + |
3431 | + |
3432 | + |
3433 | + |
3434 | + |
3435 | + |
3436 | + |
3437 | + |
3438 | + |
3439 | + |
3440 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 |
3441 | $as_echo_n "checking for a sed that does not truncate output... " >&6; } |
3442 | if test "${ac_cv_path_SED+set}" = set; then : |
3443 | @@ -6740,7 +6689,7 @@ |
3444 | done |
3445 | IFS=$as_save_IFS |
3446 | if test -z "$ac_cv_path_SED"; then |
3447 | - as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 |
3448 | + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 |
3449 | fi |
3450 | else |
3451 | ac_cv_path_SED=$SED |
3452 | @@ -6819,7 +6768,7 @@ |
3453 | done |
3454 | IFS=$as_save_IFS |
3455 | if test -z "$ac_cv_path_FGREP"; then |
3456 | - as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
3457 | + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
3458 | fi |
3459 | else |
3460 | ac_cv_path_FGREP=$FGREP |
3461 | @@ -6935,7 +6884,7 @@ |
3462 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3463 | $as_echo "no" >&6; } |
3464 | fi |
3465 | -test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 |
3466 | +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 |
3467 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 |
3468 | $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } |
3469 | if test "${lt_cv_prog_gnu_ld+set}" = set; then : |
3470 | @@ -7018,8 +6967,11 @@ |
3471 | NM="$lt_cv_path_NM" |
3472 | else |
3473 | # Didn't find any BSD compatible name lister, look for dumpbin. |
3474 | - if test -n "$ac_tool_prefix"; then |
3475 | - for ac_prog in "dumpbin -symbols" "link -dump -symbols" |
3476 | + if test -n "$DUMPBIN"; then : |
3477 | + # Let the user override the test. |
3478 | + else |
3479 | + if test -n "$ac_tool_prefix"; then |
3480 | + for ac_prog in dumpbin "link -dump" |
3481 | do |
3482 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
3483 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
3484 | @@ -7063,7 +7015,7 @@ |
3485 | fi |
3486 | if test -z "$DUMPBIN"; then |
3487 | ac_ct_DUMPBIN=$DUMPBIN |
3488 | - for ac_prog in "dumpbin -symbols" "link -dump -symbols" |
3489 | + for ac_prog in dumpbin "link -dump" |
3490 | do |
3491 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
3492 | set dummy $ac_prog; ac_word=$2 |
3493 | @@ -7118,6 +7070,15 @@ |
3494 | fi |
3495 | fi |
3496 | |
3497 | + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in |
3498 | + *COFF*) |
3499 | + DUMPBIN="$DUMPBIN -symbols" |
3500 | + ;; |
3501 | + *) |
3502 | + DUMPBIN=: |
3503 | + ;; |
3504 | + esac |
3505 | + fi |
3506 | |
3507 | if test "$DUMPBIN" != ":"; then |
3508 | NM="$DUMPBIN" |
3509 | @@ -7137,13 +7098,13 @@ |
3510 | else |
3511 | lt_cv_nm_interface="BSD nm" |
3512 | echo "int some_variable = 0;" > conftest.$ac_ext |
3513 | - (eval echo "\"\$as_me:7140: $ac_compile\"" >&5) |
3514 | + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) |
3515 | (eval "$ac_compile" 2>conftest.err) |
3516 | cat conftest.err >&5 |
3517 | - (eval echo "\"\$as_me:7143: $NM \\\"conftest.$ac_objext\\\"\"" >&5) |
3518 | + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) |
3519 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
3520 | cat conftest.err >&5 |
3521 | - (eval echo "\"\$as_me:7146: output\"" >&5) |
3522 | + (eval echo "\"\$as_me:$LINENO: output\"" >&5) |
3523 | cat conftest.out >&5 |
3524 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
3525 | lt_cv_nm_interface="MS dumpbin" |
3526 | @@ -7200,6 +7161,11 @@ |
3527 | lt_cv_sys_max_cmd_len=8192; |
3528 | ;; |
3529 | |
3530 | + mint*) |
3531 | + # On MiNT this can take a long time and run out of memory. |
3532 | + lt_cv_sys_max_cmd_len=8192; |
3533 | + ;; |
3534 | + |
3535 | amigaos*) |
3536 | # On AmigaOS with pdksh, this test takes hours, literally. |
3537 | # So we just punt and use a minimum line length of 8192. |
3538 | @@ -7264,8 +7230,8 @@ |
3539 | # If test is not a shell built-in, we'll probably end up computing a |
3540 | # maximum length that is only half of the actual maximum length, but |
3541 | # we can't tell. |
3542 | - while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ |
3543 | - = "XX$teststring$teststring"; } >/dev/null 2>&1 && |
3544 | + while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ |
3545 | + = "X$teststring$teststring"; } >/dev/null 2>&1 && |
3546 | test $i != 17 # 1/2 MB should be enough |
3547 | do |
3548 | i=`expr $i + 1` |
3549 | @@ -7536,16 +7502,18 @@ |
3550 | # Base MSYS/MinGW do not provide the 'file' command needed by |
3551 | # func_win32_libid shell function, so use a weaker test based on 'objdump', |
3552 | # unless we find 'file', for example because we are cross-compiling. |
3553 | - if ( file / ) >/dev/null 2>&1; then |
3554 | + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. |
3555 | + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then |
3556 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
3557 | lt_cv_file_magic_cmd='func_win32_libid' |
3558 | else |
3559 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
3560 | + # Keep this pattern in sync with the one in func_win32_libid. |
3561 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
3562 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
3563 | fi |
3564 | ;; |
3565 | |
3566 | -cegcc) |
3567 | +cegcc*) |
3568 | # use the weaker test based on 'objdump'. See mingw*. |
3569 | lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' |
3570 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
3571 | @@ -7575,6 +7543,10 @@ |
3572 | lt_cv_deplibs_check_method=pass_all |
3573 | ;; |
3574 | |
3575 | +haiku*) |
3576 | + lt_cv_deplibs_check_method=pass_all |
3577 | + ;; |
3578 | + |
3579 | hpux10.20* | hpux11*) |
3580 | lt_cv_file_magic_cmd=/usr/bin/file |
3581 | case $host_cpu in |
3582 | @@ -7583,11 +7555,11 @@ |
3583 | lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so |
3584 | ;; |
3585 | hppa*64*) |
3586 | - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' |
3587 | + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' |
3588 | lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl |
3589 | ;; |
3590 | *) |
3591 | - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' |
3592 | + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' |
3593 | lt_cv_file_magic_test_file=/usr/lib/libc.sl |
3594 | ;; |
3595 | esac |
3596 | @@ -7609,7 +7581,7 @@ |
3597 | ;; |
3598 | |
3599 | # This must be Linux ELF. |
3600 | -linux* | k*bsd*-gnu) |
3601 | +linux* | k*bsd*-gnu | kopensolaris*-gnu) |
3602 | lt_cv_deplibs_check_method=pass_all |
3603 | ;; |
3604 | |
3605 | @@ -8025,6 +7997,18 @@ |
3606 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
3607 | fi |
3608 | |
3609 | +case $host_os in |
3610 | + darwin*) |
3611 | + lock_old_archive_extraction=yes ;; |
3612 | + *) |
3613 | + lock_old_archive_extraction=no ;; |
3614 | +esac |
3615 | + |
3616 | + |
3617 | + |
3618 | + |
3619 | + |
3620 | + |
3621 | |
3622 | |
3623 | |
3624 | @@ -8194,8 +8178,8 @@ |
3625 | test $ac_status = 0; }; then |
3626 | # Now try to grab the symbols. |
3627 | nlist=conftest.nm |
3628 | - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 |
3629 | - (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 |
3630 | + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 |
3631 | + (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 |
3632 | ac_status=$? |
3633 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
3634 | test $ac_status = 0; } && test -s "$nlist"; then |
3635 | @@ -8348,7 +8332,7 @@ |
3636 | ;; |
3637 | *-*-irix6*) |
3638 | # Find out which ABI we are using. |
3639 | - echo '#line 8351 "configure"' > conftest.$ac_ext |
3640 | + echo '#line '$LINENO' "configure"' > conftest.$ac_ext |
3641 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
3642 | (eval $ac_compile) 2>&5 |
3643 | ac_status=$? |
3644 | @@ -9060,6 +9044,38 @@ |
3645 | fi |
3646 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 |
3647 | $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } |
3648 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 |
3649 | +$as_echo_n "checking for -force_load linker flag... " >&6; } |
3650 | +if test "${lt_cv_ld_force_load+set}" = set; then : |
3651 | + $as_echo_n "(cached) " >&6 |
3652 | +else |
3653 | + lt_cv_ld_force_load=no |
3654 | + cat > conftest.c << _LT_EOF |
3655 | +int forced_loaded() { return 2;} |
3656 | +_LT_EOF |
3657 | + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 |
3658 | + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
3659 | + echo "$AR cru libconftest.a conftest.o" >&5 |
3660 | + $AR cru libconftest.a conftest.o 2>&5 |
3661 | + echo "$RANLIB libconftest.a" >&5 |
3662 | + $RANLIB libconftest.a 2>&5 |
3663 | + cat > conftest.c << _LT_EOF |
3664 | +int main() { return 0;} |
3665 | +_LT_EOF |
3666 | + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 |
3667 | + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err |
3668 | + _lt_result=$? |
3669 | + if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then |
3670 | + lt_cv_ld_force_load=yes |
3671 | + else |
3672 | + cat conftest.err >&5 |
3673 | + fi |
3674 | + rm -f conftest.err libconftest.a conftest conftest.c |
3675 | + rm -rf conftest.dSYM |
3676 | + |
3677 | +fi |
3678 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 |
3679 | +$as_echo "$lt_cv_ld_force_load" >&6; } |
3680 | case $host_os in |
3681 | rhapsody* | darwin1.[012]) |
3682 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; |
3683 | @@ -9087,7 +9103,7 @@ |
3684 | else |
3685 | _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' |
3686 | fi |
3687 | - if test "$DSYMUTIL" != ":"; then |
3688 | + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then |
3689 | _lt_dsymutil='~$DSYMUTIL $lib || :' |
3690 | else |
3691 | _lt_dsymutil= |
3692 | @@ -9102,8 +9118,7 @@ |
3693 | as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
3694 | ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default |
3695 | " |
3696 | -eval as_val=\$$as_ac_Header |
3697 | - if test "x$as_val" = x""yes; then : |
3698 | +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : |
3699 | cat >>confdefs.h <<_ACEOF |
3700 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
3701 | _ACEOF |
3702 | @@ -9128,530 +9143,6 @@ |
3703 | |
3704 | |
3705 | |
3706 | -ac_ext=cpp |
3707 | -ac_cpp='$CXXCPP $CPPFLAGS' |
3708 | -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
3709 | -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
3710 | -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |
3711 | -if test -z "$CXX"; then |
3712 | - if test -n "$CCC"; then |
3713 | - CXX=$CCC |
3714 | - else |
3715 | - if test -n "$ac_tool_prefix"; then |
3716 | - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC |
3717 | - do |
3718 | - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
3719 | -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
3720 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3721 | -$as_echo_n "checking for $ac_word... " >&6; } |
3722 | -if test "${ac_cv_prog_CXX+set}" = set; then : |
3723 | - $as_echo_n "(cached) " >&6 |
3724 | -else |
3725 | - if test -n "$CXX"; then |
3726 | - ac_cv_prog_CXX="$CXX" # Let the user override the test. |
3727 | -else |
3728 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3729 | -for as_dir in $PATH |
3730 | -do |
3731 | - IFS=$as_save_IFS |
3732 | - test -z "$as_dir" && as_dir=. |
3733 | - for ac_exec_ext in '' $ac_executable_extensions; do |
3734 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3735 | - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" |
3736 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3737 | - break 2 |
3738 | - fi |
3739 | -done |
3740 | - done |
3741 | -IFS=$as_save_IFS |
3742 | - |
3743 | -fi |
3744 | -fi |
3745 | -CXX=$ac_cv_prog_CXX |
3746 | -if test -n "$CXX"; then |
3747 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 |
3748 | -$as_echo "$CXX" >&6; } |
3749 | -else |
3750 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3751 | -$as_echo "no" >&6; } |
3752 | -fi |
3753 | - |
3754 | - |
3755 | - test -n "$CXX" && break |
3756 | - done |
3757 | -fi |
3758 | -if test -z "$CXX"; then |
3759 | - ac_ct_CXX=$CXX |
3760 | - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC |
3761 | -do |
3762 | - # Extract the first word of "$ac_prog", so it can be a program name with args. |
3763 | -set dummy $ac_prog; ac_word=$2 |
3764 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3765 | -$as_echo_n "checking for $ac_word... " >&6; } |
3766 | -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : |
3767 | - $as_echo_n "(cached) " >&6 |
3768 | -else |
3769 | - if test -n "$ac_ct_CXX"; then |
3770 | - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. |
3771 | -else |
3772 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3773 | -for as_dir in $PATH |
3774 | -do |
3775 | - IFS=$as_save_IFS |
3776 | - test -z "$as_dir" && as_dir=. |
3777 | - for ac_exec_ext in '' $ac_executable_extensions; do |
3778 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3779 | - ac_cv_prog_ac_ct_CXX="$ac_prog" |
3780 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3781 | - break 2 |
3782 | - fi |
3783 | -done |
3784 | - done |
3785 | -IFS=$as_save_IFS |
3786 | - |
3787 | -fi |
3788 | -fi |
3789 | -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX |
3790 | -if test -n "$ac_ct_CXX"; then |
3791 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 |
3792 | -$as_echo "$ac_ct_CXX" >&6; } |
3793 | -else |
3794 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3795 | -$as_echo "no" >&6; } |
3796 | -fi |
3797 | - |
3798 | - |
3799 | - test -n "$ac_ct_CXX" && break |
3800 | -done |
3801 | - |
3802 | - if test "x$ac_ct_CXX" = x; then |
3803 | - CXX="g++" |
3804 | - else |
3805 | - case $cross_compiling:$ac_tool_warned in |
3806 | -yes:) |
3807 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
3808 | -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
3809 | -ac_tool_warned=yes ;; |
3810 | -esac |
3811 | - CXX=$ac_ct_CXX |
3812 | - fi |
3813 | -fi |
3814 | - |
3815 | - fi |
3816 | -fi |
3817 | -# Provide some information about the compiler. |
3818 | -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 |
3819 | -set X $ac_compile |
3820 | -ac_compiler=$2 |
3821 | -for ac_option in --version -v -V -qversion; do |
3822 | - { { ac_try="$ac_compiler $ac_option >&5" |
3823 | -case "(($ac_try" in |
3824 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
3825 | - *) ac_try_echo=$ac_try;; |
3826 | -esac |
3827 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
3828 | -$as_echo "$ac_try_echo"; } >&5 |
3829 | - (eval "$ac_compiler $ac_option >&5") 2>conftest.err |
3830 | - ac_status=$? |
3831 | - if test -s conftest.err; then |
3832 | - sed '10a\ |
3833 | -... rest of stderr output deleted ... |
3834 | - 10q' conftest.err >conftest.er1 |
3835 | - cat conftest.er1 >&5 |
3836 | - fi |
3837 | - rm -f conftest.er1 conftest.err |
3838 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
3839 | - test $ac_status = 0; } |
3840 | -done |
3841 | - |
3842 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 |
3843 | -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } |
3844 | -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : |
3845 | - $as_echo_n "(cached) " >&6 |
3846 | -else |
3847 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3848 | -/* end confdefs.h. */ |
3849 | - |
3850 | -int |
3851 | -main () |
3852 | -{ |
3853 | -#ifndef __GNUC__ |
3854 | - choke me |
3855 | -#endif |
3856 | - |
3857 | - ; |
3858 | - return 0; |
3859 | -} |
3860 | -_ACEOF |
3861 | -if ac_fn_cxx_try_compile "$LINENO"; then : |
3862 | - ac_compiler_gnu=yes |
3863 | -else |
3864 | - ac_compiler_gnu=no |
3865 | -fi |
3866 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
3867 | -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu |
3868 | - |
3869 | -fi |
3870 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 |
3871 | -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } |
3872 | -if test $ac_compiler_gnu = yes; then |
3873 | - GXX=yes |
3874 | -else |
3875 | - GXX= |
3876 | -fi |
3877 | -ac_test_CXXFLAGS=${CXXFLAGS+set} |
3878 | -ac_save_CXXFLAGS=$CXXFLAGS |
3879 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 |
3880 | -$as_echo_n "checking whether $CXX accepts -g... " >&6; } |
3881 | -if test "${ac_cv_prog_cxx_g+set}" = set; then : |
3882 | - $as_echo_n "(cached) " >&6 |
3883 | -else |
3884 | - ac_save_cxx_werror_flag=$ac_cxx_werror_flag |
3885 | - ac_cxx_werror_flag=yes |
3886 | - ac_cv_prog_cxx_g=no |
3887 | - CXXFLAGS="-g" |
3888 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3889 | -/* end confdefs.h. */ |
3890 | - |
3891 | -int |
3892 | -main () |
3893 | -{ |
3894 | - |
3895 | - ; |
3896 | - return 0; |
3897 | -} |
3898 | -_ACEOF |
3899 | -if ac_fn_cxx_try_compile "$LINENO"; then : |
3900 | - ac_cv_prog_cxx_g=yes |
3901 | -else |
3902 | - CXXFLAGS="" |
3903 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3904 | -/* end confdefs.h. */ |
3905 | - |
3906 | -int |
3907 | -main () |
3908 | -{ |
3909 | - |
3910 | - ; |
3911 | - return 0; |
3912 | -} |
3913 | -_ACEOF |
3914 | -if ac_fn_cxx_try_compile "$LINENO"; then : |
3915 | - |
3916 | -else |
3917 | - ac_cxx_werror_flag=$ac_save_cxx_werror_flag |
3918 | - CXXFLAGS="-g" |
3919 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3920 | -/* end confdefs.h. */ |
3921 | - |
3922 | -int |
3923 | -main () |
3924 | -{ |
3925 | - |
3926 | - ; |
3927 | - return 0; |
3928 | -} |
3929 | -_ACEOF |
3930 | -if ac_fn_cxx_try_compile "$LINENO"; then : |
3931 | - ac_cv_prog_cxx_g=yes |
3932 | -fi |
3933 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
3934 | -fi |
3935 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
3936 | -fi |
3937 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
3938 | - ac_cxx_werror_flag=$ac_save_cxx_werror_flag |
3939 | -fi |
3940 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 |
3941 | -$as_echo "$ac_cv_prog_cxx_g" >&6; } |
3942 | -if test "$ac_test_CXXFLAGS" = set; then |
3943 | - CXXFLAGS=$ac_save_CXXFLAGS |
3944 | -elif test $ac_cv_prog_cxx_g = yes; then |
3945 | - if test "$GXX" = yes; then |
3946 | - CXXFLAGS="-g -O2" |
3947 | - else |
3948 | - CXXFLAGS="-g" |
3949 | - fi |
3950 | -else |
3951 | - if test "$GXX" = yes; then |
3952 | - CXXFLAGS="-O2" |
3953 | - else |
3954 | - CXXFLAGS= |
3955 | - fi |
3956 | -fi |
3957 | -ac_ext=c |
3958 | -ac_cpp='$CPP $CPPFLAGS' |
3959 | -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
3960 | -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
3961 | -ac_compiler_gnu=$ac_cv_c_compiler_gnu |
3962 | - |
3963 | -depcc="$CXX" am_compiler_list= |
3964 | - |
3965 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
3966 | -$as_echo_n "checking dependency style of $depcc... " >&6; } |
3967 | -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : |
3968 | - $as_echo_n "(cached) " >&6 |
3969 | -else |
3970 | - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then |
3971 | - # We make a subdir and do the tests there. Otherwise we can end up |
3972 | - # making bogus files that we don't know about and never remove. For |
3973 | - # instance it was reported that on HP-UX the gcc test will end up |
3974 | - # making a dummy file named `D' -- because `-MD' means `put the output |
3975 | - # in D'. |
3976 | - mkdir conftest.dir |
3977 | - # Copy depcomp to subdir because otherwise we won't find it if we're |
3978 | - # using a relative directory. |
3979 | - cp "$am_depcomp" conftest.dir |
3980 | - cd conftest.dir |
3981 | - # We will build objects and dependencies in a subdirectory because |
3982 | - # it helps to detect inapplicable dependency modes. For instance |
3983 | - # both Tru64's cc and ICC support -MD to output dependencies as a |
3984 | - # side effect of compilation, but ICC will put the dependencies in |
3985 | - # the current directory while Tru64 will put them in the object |
3986 | - # directory. |
3987 | - mkdir sub |
3988 | - |
3989 | - am_cv_CXX_dependencies_compiler_type=none |
3990 | - if test "$am_compiler_list" = ""; then |
3991 | - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` |
3992 | - fi |
3993 | - am__universal=false |
3994 | - case " $depcc " in #( |
3995 | - *\ -arch\ *\ -arch\ *) am__universal=true ;; |
3996 | - esac |
3997 | - |
3998 | - for depmode in $am_compiler_list; do |
3999 | - # Setup a source with many dependencies, because some compilers |
4000 | - # like to wrap large dependency lists on column 80 (with \), and |
4001 | - # we should not choose a depcomp mode which is confused by this. |
4002 | - # |
4003 | - # We need to recreate these files for each test, as the compiler may |
4004 | - # overwrite some of them when testing with obscure command lines. |
4005 | - # This happens at least with the AIX C compiler. |
4006 | - : > sub/conftest.c |
4007 | - for i in 1 2 3 4 5 6; do |
4008 | - echo '#include "conftst'$i'.h"' >> sub/conftest.c |
4009 | - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with |
4010 | - # Solaris 8's {/usr,}/bin/sh. |
4011 | - touch sub/conftst$i.h |
4012 | - done |
4013 | - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
4014 | - |
4015 | - # We check with `-c' and `-o' for the sake of the "dashmstdout" |
4016 | - # mode. It turns out that the SunPro C++ compiler does not properly |
4017 | - # handle `-M -o', and we need to detect this. Also, some Intel |
4018 | - # versions had trouble with output in subdirs |
4019 | - am__obj=sub/conftest.${OBJEXT-o} |
4020 | - am__minus_obj="-o $am__obj" |
4021 | - case $depmode in |
4022 | - gcc) |
4023 | - # This depmode causes a compiler race in universal mode. |
4024 | - test "$am__universal" = false || continue |
4025 | - ;; |
4026 | - nosideeffect) |
4027 | - # after this tag, mechanisms are not by side-effect, so they'll |
4028 | - # only be used when explicitly requested |
4029 | - if test "x$enable_dependency_tracking" = xyes; then |
4030 | - continue |
4031 | - else |
4032 | - break |
4033 | - fi |
4034 | - ;; |
4035 | - msvisualcpp | msvcmsys) |
4036 | - # This compiler won't grok `-c -o', but also, the minuso test has |
4037 | - # not run yet. These depmodes are late enough in the game, and |
4038 | - # so weak that their functioning should not be impacted. |
4039 | - am__obj=conftest.${OBJEXT-o} |
4040 | - am__minus_obj= |
4041 | - ;; |
4042 | - none) break ;; |
4043 | - esac |
4044 | - if depmode=$depmode \ |
4045 | - source=sub/conftest.c object=$am__obj \ |
4046 | - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ |
4047 | - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ |
4048 | - >/dev/null 2>conftest.err && |
4049 | - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && |
4050 | - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && |
4051 | - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && |
4052 | - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then |
4053 | - # icc doesn't choke on unknown options, it will just issue warnings |
4054 | - # or remarks (even with -Werror). So we grep stderr for any message |
4055 | - # that says an option was ignored or not supported. |
4056 | - # When given -MP, icc 7.0 and 7.1 complain thusly: |
4057 | - # icc: Command line warning: ignoring option '-M'; no argument required |
4058 | - # The diagnosis changed in icc 8.0: |
4059 | - # icc: Command line remark: option '-MP' not supported |
4060 | - if (grep 'ignoring option' conftest.err || |
4061 | - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else |
4062 | - am_cv_CXX_dependencies_compiler_type=$depmode |
4063 | - break |
4064 | - fi |
4065 | - fi |
4066 | - done |
4067 | - |
4068 | - cd .. |
4069 | - rm -rf conftest.dir |
4070 | -else |
4071 | - am_cv_CXX_dependencies_compiler_type=none |
4072 | -fi |
4073 | - |
4074 | -fi |
4075 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 |
4076 | -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } |
4077 | -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type |
4078 | - |
4079 | - if |
4080 | - test "x$enable_dependency_tracking" != xno \ |
4081 | - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then |
4082 | - am__fastdepCXX_TRUE= |
4083 | - am__fastdepCXX_FALSE='#' |
4084 | -else |
4085 | - am__fastdepCXX_TRUE='#' |
4086 | - am__fastdepCXX_FALSE= |
4087 | -fi |
4088 | - |
4089 | - |
4090 | -if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
4091 | - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
4092 | - (test "X$CXX" != "Xg++"))) ; then |
4093 | - ac_ext=cpp |
4094 | -ac_cpp='$CXXCPP $CPPFLAGS' |
4095 | -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
4096 | -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
4097 | -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |
4098 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 |
4099 | -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } |
4100 | -if test -z "$CXXCPP"; then |
4101 | - if test "${ac_cv_prog_CXXCPP+set}" = set; then : |
4102 | - $as_echo_n "(cached) " >&6 |
4103 | -else |
4104 | - # Double quotes because CXXCPP needs to be expanded |
4105 | - for CXXCPP in "$CXX -E" "/lib/cpp" |
4106 | - do |
4107 | - ac_preproc_ok=false |
4108 | -for ac_cxx_preproc_warn_flag in '' yes |
4109 | -do |
4110 | - # Use a header file that comes with gcc, so configuring glibc |
4111 | - # with a fresh cross-compiler works. |
4112 | - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
4113 | - # <limits.h> exists even on freestanding compilers. |
4114 | - # On the NeXT, cc -E runs the code through the compiler's parser, |
4115 | - # not just through cpp. "Syntax error" is here to catch this case. |
4116 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4117 | -/* end confdefs.h. */ |
4118 | -#ifdef __STDC__ |
4119 | -# include <limits.h> |
4120 | -#else |
4121 | -# include <assert.h> |
4122 | -#endif |
4123 | - Syntax error |
4124 | -_ACEOF |
4125 | -if ac_fn_cxx_try_cpp "$LINENO"; then : |
4126 | - |
4127 | -else |
4128 | - # Broken: fails on valid input. |
4129 | -continue |
4130 | -fi |
4131 | -rm -f conftest.err conftest.$ac_ext |
4132 | - |
4133 | - # OK, works on sane cases. Now check whether nonexistent headers |
4134 | - # can be detected and how. |
4135 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4136 | -/* end confdefs.h. */ |
4137 | -#include <ac_nonexistent.h> |
4138 | -_ACEOF |
4139 | -if ac_fn_cxx_try_cpp "$LINENO"; then : |
4140 | - # Broken: success on invalid input. |
4141 | -continue |
4142 | -else |
4143 | - # Passes both tests. |
4144 | -ac_preproc_ok=: |
4145 | -break |
4146 | -fi |
4147 | -rm -f conftest.err conftest.$ac_ext |
4148 | - |
4149 | -done |
4150 | -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
4151 | -rm -f conftest.err conftest.$ac_ext |
4152 | -if $ac_preproc_ok; then : |
4153 | - break |
4154 | -fi |
4155 | - |
4156 | - done |
4157 | - ac_cv_prog_CXXCPP=$CXXCPP |
4158 | - |
4159 | -fi |
4160 | - CXXCPP=$ac_cv_prog_CXXCPP |
4161 | -else |
4162 | - ac_cv_prog_CXXCPP=$CXXCPP |
4163 | -fi |
4164 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 |
4165 | -$as_echo "$CXXCPP" >&6; } |
4166 | -ac_preproc_ok=false |
4167 | -for ac_cxx_preproc_warn_flag in '' yes |
4168 | -do |
4169 | - # Use a header file that comes with gcc, so configuring glibc |
4170 | - # with a fresh cross-compiler works. |
4171 | - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
4172 | - # <limits.h> exists even on freestanding compilers. |
4173 | - # On the NeXT, cc -E runs the code through the compiler's parser, |
4174 | - # not just through cpp. "Syntax error" is here to catch this case. |
4175 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4176 | -/* end confdefs.h. */ |
4177 | -#ifdef __STDC__ |
4178 | -# include <limits.h> |
4179 | -#else |
4180 | -# include <assert.h> |
4181 | -#endif |
4182 | - Syntax error |
4183 | -_ACEOF |
4184 | -if ac_fn_cxx_try_cpp "$LINENO"; then : |
4185 | - |
4186 | -else |
4187 | - # Broken: fails on valid input. |
4188 | -continue |
4189 | -fi |
4190 | -rm -f conftest.err conftest.$ac_ext |
4191 | - |
4192 | - # OK, works on sane cases. Now check whether nonexistent headers |
4193 | - # can be detected and how. |
4194 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4195 | -/* end confdefs.h. */ |
4196 | -#include <ac_nonexistent.h> |
4197 | -_ACEOF |
4198 | -if ac_fn_cxx_try_cpp "$LINENO"; then : |
4199 | - # Broken: success on invalid input. |
4200 | -continue |
4201 | -else |
4202 | - # Passes both tests. |
4203 | -ac_preproc_ok=: |
4204 | -break |
4205 | -fi |
4206 | -rm -f conftest.err conftest.$ac_ext |
4207 | - |
4208 | -done |
4209 | -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
4210 | -rm -f conftest.err conftest.$ac_ext |
4211 | -if $ac_preproc_ok; then : |
4212 | - |
4213 | -else |
4214 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
4215 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
4216 | -_lt_caught_CXX_error=yes; } |
4217 | -fi |
4218 | - |
4219 | -ac_ext=c |
4220 | -ac_cpp='$CPP $CPPFLAGS' |
4221 | -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
4222 | -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
4223 | -ac_compiler_gnu=$ac_cv_c_compiler_gnu |
4224 | - |
4225 | -else |
4226 | - _lt_caught_CXX_error=yes |
4227 | -fi |
4228 | - |
4229 | - |
4230 | |
4231 | |
4232 | |
4233 | @@ -9777,6 +9268,7 @@ |
4234 | |
4235 | |
4236 | |
4237 | + |
4238 | test -z "$LN_S" && LN_S="ln -s" |
4239 | |
4240 | |
4241 | @@ -9826,19 +9318,6 @@ |
4242 | |
4243 | |
4244 | |
4245 | - |
4246 | - |
4247 | - |
4248 | - |
4249 | - |
4250 | - |
4251 | - |
4252 | - |
4253 | - |
4254 | - |
4255 | - |
4256 | - |
4257 | - |
4258 | case $host_os in |
4259 | aix3*) |
4260 | # AIX sometimes has problems with the GCC collect2 program. For some |
4261 | @@ -9851,23 +9330,6 @@ |
4262 | ;; |
4263 | esac |
4264 | |
4265 | -# Sed substitution that helps us do robust quoting. It backslashifies |
4266 | -# metacharacters that are still active within double-quoted strings. |
4267 | -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' |
4268 | - |
4269 | -# Same as above, but do not quote variable references. |
4270 | -double_quote_subst='s/\(["`\\]\)/\\\1/g' |
4271 | - |
4272 | -# Sed substitution to delay expansion of an escaped shell variable in a |
4273 | -# double_quote_subst'ed string. |
4274 | -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' |
4275 | - |
4276 | -# Sed substitution to delay expansion of an escaped single quote. |
4277 | -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' |
4278 | - |
4279 | -# Sed substitution to avoid accidental globbing in evaled expressions |
4280 | -no_glob_subst='s/\*/\\\*/g' |
4281 | - |
4282 | # Global variables: |
4283 | ofile=libtool |
4284 | can_build_shared=yes |
4285 | @@ -9896,7 +9358,7 @@ |
4286 | *) break;; |
4287 | esac |
4288 | done |
4289 | -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
4290 | +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` |
4291 | |
4292 | |
4293 | # Only perform the check for file, if the check method requires it |
4294 | @@ -10105,7 +9567,12 @@ |
4295 | lt_prog_compiler_no_builtin_flag= |
4296 | |
4297 | if test "$GCC" = yes; then |
4298 | - lt_prog_compiler_no_builtin_flag=' -fno-builtin' |
4299 | + case $cc_basename in |
4300 | + nvcc*) |
4301 | + lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; |
4302 | + *) |
4303 | + lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; |
4304 | + esac |
4305 | |
4306 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 |
4307 | $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } |
4308 | @@ -10125,15 +9592,15 @@ |
4309 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
4310 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
4311 | -e 's:$: $lt_compiler_flag:'` |
4312 | - (eval echo "\"\$as_me:10128: $lt_compile\"" >&5) |
4313 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) |
4314 | (eval "$lt_compile" 2>conftest.err) |
4315 | ac_status=$? |
4316 | cat conftest.err >&5 |
4317 | - echo "$as_me:10132: \$? = $ac_status" >&5 |
4318 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4319 | if (exit $ac_status) && test -s "$ac_outfile"; then |
4320 | # The compiler can only warn and ignore the option if not recognized |
4321 | # So say no if there are warnings other than the usual output. |
4322 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp |
4323 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp |
4324 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
4325 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
4326 | lt_cv_prog_compiler_rtti_exceptions=yes |
4327 | @@ -10211,6 +9678,12 @@ |
4328 | lt_prog_compiler_pic='-fno-common' |
4329 | ;; |
4330 | |
4331 | + haiku*) |
4332 | + # PIC is the default for Haiku. |
4333 | + # The "-static" flag exists, but is broken. |
4334 | + lt_prog_compiler_static= |
4335 | + ;; |
4336 | + |
4337 | hpux*) |
4338 | # PIC is the default for 64-bit PA HP-UX, but not for 32-bit |
4339 | # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag |
4340 | @@ -10253,6 +9726,13 @@ |
4341 | lt_prog_compiler_pic='-fPIC' |
4342 | ;; |
4343 | esac |
4344 | + |
4345 | + case $cc_basename in |
4346 | + nvcc*) # Cuda Compiler Driver 2.2 |
4347 | + lt_prog_compiler_wl='-Xlinker ' |
4348 | + lt_prog_compiler_pic='-Xcompiler -fPIC' |
4349 | + ;; |
4350 | + esac |
4351 | else |
4352 | # PORTME Check for flag to pass linker flags through the system compiler. |
4353 | case $host_os in |
4354 | @@ -10294,7 +9774,7 @@ |
4355 | lt_prog_compiler_static='-non_shared' |
4356 | ;; |
4357 | |
4358 | - linux* | k*bsd*-gnu) |
4359 | + linux* | k*bsd*-gnu | kopensolaris*-gnu) |
4360 | case $cc_basename in |
4361 | # old Intel for x86_64 which still supported -KPIC. |
4362 | ecc*) |
4363 | @@ -10315,7 +9795,7 @@ |
4364 | lt_prog_compiler_pic='--shared' |
4365 | lt_prog_compiler_static='--static' |
4366 | ;; |
4367 | - pgcc* | pgf77* | pgf90* | pgf95*) |
4368 | + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
4369 | # Portland Group compilers (*not* the Pentium gcc compiler, |
4370 | # which looks to be a dead project) |
4371 | lt_prog_compiler_wl='-Wl,' |
4372 | @@ -10327,26 +9807,26 @@ |
4373 | # All Alpha code is PIC. |
4374 | lt_prog_compiler_static='-non_shared' |
4375 | ;; |
4376 | - xl*) |
4377 | - # IBM XL C 8.0/Fortran 10.1 on PPC |
4378 | + xl* | bgxl* | bgf* | mpixl*) |
4379 | + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene |
4380 | lt_prog_compiler_wl='-Wl,' |
4381 | lt_prog_compiler_pic='-qpic' |
4382 | lt_prog_compiler_static='-qstaticlink' |
4383 | ;; |
4384 | *) |
4385 | case `$CC -V 2>&1 | sed 5q` in |
4386 | + *Sun\ F* | *Sun*Fortran*) |
4387 | + # Sun Fortran 8.3 passes all unrecognized flags to the linker |
4388 | + lt_prog_compiler_pic='-KPIC' |
4389 | + lt_prog_compiler_static='-Bstatic' |
4390 | + lt_prog_compiler_wl='' |
4391 | + ;; |
4392 | *Sun\ C*) |
4393 | # Sun C 5.9 |
4394 | lt_prog_compiler_pic='-KPIC' |
4395 | lt_prog_compiler_static='-Bstatic' |
4396 | lt_prog_compiler_wl='-Wl,' |
4397 | ;; |
4398 | - *Sun\ F*) |
4399 | - # Sun Fortran 8.3 passes all unrecognized flags to the linker |
4400 | - lt_prog_compiler_pic='-KPIC' |
4401 | - lt_prog_compiler_static='-Bstatic' |
4402 | - lt_prog_compiler_wl='' |
4403 | - ;; |
4404 | esac |
4405 | ;; |
4406 | esac |
4407 | @@ -10377,7 +9857,7 @@ |
4408 | lt_prog_compiler_pic='-KPIC' |
4409 | lt_prog_compiler_static='-Bstatic' |
4410 | case $cc_basename in |
4411 | - f77* | f90* | f95*) |
4412 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
4413 | lt_prog_compiler_wl='-Qoption ld ';; |
4414 | *) |
4415 | lt_prog_compiler_wl='-Wl,';; |
4416 | @@ -10464,15 +9944,15 @@ |
4417 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
4418 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
4419 | -e 's:$: $lt_compiler_flag:'` |
4420 | - (eval echo "\"\$as_me:10467: $lt_compile\"" >&5) |
4421 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) |
4422 | (eval "$lt_compile" 2>conftest.err) |
4423 | ac_status=$? |
4424 | cat conftest.err >&5 |
4425 | - echo "$as_me:10471: \$? = $ac_status" >&5 |
4426 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4427 | if (exit $ac_status) && test -s "$ac_outfile"; then |
4428 | # The compiler can only warn and ignore the option if not recognized |
4429 | # So say no if there are warnings other than the usual output. |
4430 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp |
4431 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp |
4432 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
4433 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
4434 | lt_cv_prog_compiler_pic_works=yes |
4435 | @@ -10520,7 +10000,7 @@ |
4436 | if test -s conftest.err; then |
4437 | # Append any errors to the config.log. |
4438 | cat conftest.err 1>&5 |
4439 | - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp |
4440 | + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp |
4441 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
4442 | if diff conftest.exp conftest.er2 >/dev/null; then |
4443 | lt_cv_prog_compiler_static_works=yes |
4444 | @@ -10569,16 +10049,16 @@ |
4445 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
4446 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
4447 | -e 's:$: $lt_compiler_flag:'` |
4448 | - (eval echo "\"\$as_me:10572: $lt_compile\"" >&5) |
4449 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) |
4450 | (eval "$lt_compile" 2>out/conftest.err) |
4451 | ac_status=$? |
4452 | cat out/conftest.err >&5 |
4453 | - echo "$as_me:10576: \$? = $ac_status" >&5 |
4454 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4455 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
4456 | then |
4457 | # The compiler can only warn and ignore the option if not recognized |
4458 | # So say no if there are warnings |
4459 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp |
4460 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp |
4461 | $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
4462 | if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then |
4463 | lt_cv_prog_compiler_c_o=yes |
4464 | @@ -10624,16 +10104,16 @@ |
4465 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
4466 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
4467 | -e 's:$: $lt_compiler_flag:'` |
4468 | - (eval echo "\"\$as_me:10627: $lt_compile\"" >&5) |
4469 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) |
4470 | (eval "$lt_compile" 2>out/conftest.err) |
4471 | ac_status=$? |
4472 | cat out/conftest.err >&5 |
4473 | - echo "$as_me:10631: \$? = $ac_status" >&5 |
4474 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4475 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
4476 | then |
4477 | # The compiler can only warn and ignore the option if not recognized |
4478 | # So say no if there are warnings |
4479 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp |
4480 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp |
4481 | $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
4482 | if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then |
4483 | lt_cv_prog_compiler_c_o=yes |
4484 | @@ -10746,7 +10226,33 @@ |
4485 | esac |
4486 | |
4487 | ld_shlibs=yes |
4488 | + |
4489 | + # On some targets, GNU ld is compatible enough with the native linker |
4490 | + # that we're better off using the native interface for both. |
4491 | + lt_use_gnu_ld_interface=no |
4492 | if test "$with_gnu_ld" = yes; then |
4493 | + case $host_os in |
4494 | + aix*) |
4495 | + # The AIX port of GNU ld has always aspired to compatibility |
4496 | + # with the native linker. However, as the warning in the GNU ld |
4497 | + # block says, versions before 2.19.5* couldn't really create working |
4498 | + # shared libraries, regardless of the interface used. |
4499 | + case `$LD -v 2>&1` in |
4500 | + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; |
4501 | + *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; |
4502 | + *\ \(GNU\ Binutils\)\ [3-9]*) ;; |
4503 | + *) |
4504 | + lt_use_gnu_ld_interface=yes |
4505 | + ;; |
4506 | + esac |
4507 | + ;; |
4508 | + *) |
4509 | + lt_use_gnu_ld_interface=yes |
4510 | + ;; |
4511 | + esac |
4512 | + fi |
4513 | + |
4514 | + if test "$lt_use_gnu_ld_interface" = yes; then |
4515 | # If archive_cmds runs LD, not CC, wlarc should be empty |
4516 | wlarc='${wl}' |
4517 | |
4518 | @@ -10764,6 +10270,7 @@ |
4519 | fi |
4520 | supports_anon_versioning=no |
4521 | case `$LD -v 2>&1` in |
4522 | + *GNU\ gold*) supports_anon_versioning=yes ;; |
4523 | *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 |
4524 | *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... |
4525 | *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... |
4526 | @@ -10779,11 +10286,12 @@ |
4527 | ld_shlibs=no |
4528 | cat <<_LT_EOF 1>&2 |
4529 | |
4530 | -*** Warning: the GNU linker, at least up to release 2.9.1, is reported |
4531 | +*** Warning: the GNU linker, at least up to release 2.19, is reported |
4532 | *** to be unable to reliably create shared libraries on AIX. |
4533 | *** Therefore, libtool is disabling shared libraries support. If you |
4534 | -*** really care for shared libraries, you may want to modify your PATH |
4535 | -*** so that a non-GNU linker is found, and then restart. |
4536 | +*** really care for shared libraries, you may want to install binutils |
4537 | +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. |
4538 | +*** You will then need to restart the configuration process. |
4539 | |
4540 | _LT_EOF |
4541 | fi |
4542 | @@ -10819,6 +10327,7 @@ |
4543 | # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, |
4544 | # as there is no search path for DLLs. |
4545 | hardcode_libdir_flag_spec='-L$libdir' |
4546 | + export_dynamic_flag_spec='${wl}--export-all-symbols' |
4547 | allow_undefined_flag=unsupported |
4548 | always_export_symbols=no |
4549 | enable_shared_with_static_runtimes=yes |
4550 | @@ -10840,6 +10349,11 @@ |
4551 | fi |
4552 | ;; |
4553 | |
4554 | + haiku*) |
4555 | + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4556 | + link_all_deplibs=yes |
4557 | + ;; |
4558 | + |
4559 | interix[3-9]*) |
4560 | hardcode_direct=no |
4561 | hardcode_shlibpath_var=no |
4562 | @@ -10855,7 +10369,7 @@ |
4563 | archive_expsym_cmds='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' |
4564 | ;; |
4565 | |
4566 | - gnu* | linux* | tpf* | k*bsd*-gnu) |
4567 | + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) |
4568 | tmp_diet=no |
4569 | if test "$host_os" = linux-dietlibc; then |
4570 | case $cc_basename in |
4571 | @@ -10869,11 +10383,12 @@ |
4572 | tmp_sharedflag='-shared' |
4573 | case $cc_basename,$host_cpu in |
4574 | pgcc*) # Portland Group C compiler |
4575 | - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
4576 | + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
4577 | tmp_addflag=' $pic_flag' |
4578 | ;; |
4579 | - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers |
4580 | - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
4581 | + pgf77* | pgf90* | pgf95* | pgfortran*) |
4582 | + # Portland Group f77 and f90 compilers |
4583 | + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
4584 | tmp_addflag=' $pic_flag -Mnomain' ;; |
4585 | ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 |
4586 | tmp_addflag=' -i_dynamic' ;; |
4587 | @@ -10884,13 +10399,17 @@ |
4588 | lf95*) # Lahey Fortran 8.1 |
4589 | whole_archive_flag_spec= |
4590 | tmp_sharedflag='--shared' ;; |
4591 | - xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
4592 | + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
4593 | tmp_sharedflag='-qmkshrobj' |
4594 | tmp_addflag= ;; |
4595 | + nvcc*) # Cuda Compiler Driver 2.2 |
4596 | + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
4597 | + compiler_needs_object=yes |
4598 | + ;; |
4599 | esac |
4600 | case `$CC -V 2>&1 | sed 5q` in |
4601 | *Sun\ C*) # Sun C 5.9 |
4602 | - whole_archive_flag_spec='${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' |
4603 | + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
4604 | compiler_needs_object=yes |
4605 | tmp_sharedflag='-G' ;; |
4606 | *Sun\ F*) # Sun Fortran 8.3 |
4607 | @@ -10906,17 +10425,17 @@ |
4608 | fi |
4609 | |
4610 | case $cc_basename in |
4611 | - xlf*) |
4612 | + xlf* | bgf* | bgxlf* | mpixlf*) |
4613 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
4614 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
4615 | hardcode_libdir_flag_spec= |
4616 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
4617 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
4618 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
4619 | if test "x$supports_anon_versioning" = xyes; then |
4620 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
4621 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
4622 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
4623 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
4624 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
4625 | fi |
4626 | ;; |
4627 | esac |
4628 | @@ -11037,8 +10556,10 @@ |
4629 | else |
4630 | # If we're using GNU nm, then we don't want the "-C" option. |
4631 | # -C means demangle to AIX nm, but means don't demangle with GNU nm |
4632 | + # Also, AIX nm treats weak defined symbols like other global |
4633 | + # defined symbols, whereas GNU nm marks them as "W". |
4634 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
4635 | - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
4636 | + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
4637 | else |
4638 | export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
4639 | fi |
4640 | @@ -11156,7 +10677,7 @@ |
4641 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
4642 | |
4643 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
4644 | - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
4645 | + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
4646 | else |
4647 | if test "$host_cpu" = ia64; then |
4648 | hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' |
4649 | @@ -11200,8 +10721,13 @@ |
4650 | # -berok will link without error, but may produce a broken library. |
4651 | no_undefined_flag=' ${wl}-bernotok' |
4652 | allow_undefined_flag=' ${wl}-berok' |
4653 | - # Exported symbols can be pulled into shared objects from archives |
4654 | - whole_archive_flag_spec='$convenience' |
4655 | + if test "$with_gnu_ld" = yes; then |
4656 | + # We only use this code for GNU lds that support --whole-archive. |
4657 | + whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' |
4658 | + else |
4659 | + # Exported symbols can be pulled into shared objects from archives |
4660 | + whole_archive_flag_spec='$convenience' |
4661 | + fi |
4662 | archive_cmds_need_lc=yes |
4663 | # This is similar to how AIX traditionally builds its shared libraries. |
4664 | archive_expsym_cmds="\$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' |
4665 | @@ -11240,7 +10766,7 @@ |
4666 | # Tell ltmain to make .dll files, not .so files. |
4667 | shrext_cmds=".dll" |
4668 | # FIXME: Setting linknames here is a bad hack. |
4669 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' |
4670 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
4671 | # The linker will automatically build a .lib file if we build a DLL. |
4672 | old_archive_from_new_cmds='true' |
4673 | # FIXME: Should let the user specify the lib program. |
4674 | @@ -11256,7 +10782,11 @@ |
4675 | hardcode_direct=no |
4676 | hardcode_automatic=yes |
4677 | hardcode_shlibpath_var=unsupported |
4678 | - whole_archive_flag_spec='' |
4679 | + if test "$lt_cv_ld_force_load" = "yes"; then |
4680 | + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' |
4681 | + else |
4682 | + whole_archive_flag_spec='' |
4683 | + fi |
4684 | link_all_deplibs=yes |
4685 | allow_undefined_flag="$_lt_dar_allow_undefined" |
4686 | case $cc_basename in |
4687 | @@ -11264,7 +10794,7 @@ |
4688 | *) _lt_dar_can_shared=$GCC ;; |
4689 | esac |
4690 | if test "$_lt_dar_can_shared" = "yes"; then |
4691 | - output_verbose_link_cmd=echo |
4692 | + output_verbose_link_cmd=func_echo_all |
4693 | archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" |
4694 | module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" |
4695 | archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" |
4696 | @@ -11330,7 +10860,7 @@ |
4697 | ;; |
4698 | |
4699 | hpux10*) |
4700 | - if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
4701 | + if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
4702 | archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
4703 | else |
4704 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
4705 | @@ -11349,7 +10879,7 @@ |
4706 | ;; |
4707 | |
4708 | hpux11*) |
4709 | - if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
4710 | + if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
4711 | case $host_cpu in |
4712 | hppa*64*) |
4713 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
4714 | @@ -11370,7 +10900,46 @@ |
4715 | archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
4716 | ;; |
4717 | *) |
4718 | - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
4719 | + |
4720 | + # Older versions of the 11.00 compiler do not understand -b yet |
4721 | + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) |
4722 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 |
4723 | +$as_echo_n "checking if $CC understands -b... " >&6; } |
4724 | +if test "${lt_cv_prog_compiler__b+set}" = set; then : |
4725 | + $as_echo_n "(cached) " >&6 |
4726 | +else |
4727 | + lt_cv_prog_compiler__b=no |
4728 | + save_LDFLAGS="$LDFLAGS" |
4729 | + LDFLAGS="$LDFLAGS -b" |
4730 | + echo "$lt_simple_link_test_code" > conftest.$ac_ext |
4731 | + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then |
4732 | + # The linker can only warn and ignore the option if not recognized |
4733 | + # So say no if there are warnings |
4734 | + if test -s conftest.err; then |
4735 | + # Append any errors to the config.log. |
4736 | + cat conftest.err 1>&5 |
4737 | + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp |
4738 | + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
4739 | + if diff conftest.exp conftest.er2 >/dev/null; then |
4740 | + lt_cv_prog_compiler__b=yes |
4741 | + fi |
4742 | + else |
4743 | + lt_cv_prog_compiler__b=yes |
4744 | + fi |
4745 | + fi |
4746 | + $RM -r conftest* |
4747 | + LDFLAGS="$save_LDFLAGS" |
4748 | + |
4749 | +fi |
4750 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 |
4751 | +$as_echo "$lt_cv_prog_compiler__b" >&6; } |
4752 | + |
4753 | +if test x"$lt_cv_prog_compiler__b" = xyes; then |
4754 | + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
4755 | +else |
4756 | + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
4757 | +fi |
4758 | + |
4759 | ;; |
4760 | esac |
4761 | fi |
4762 | @@ -11398,7 +10967,7 @@ |
4763 | |
4764 | irix5* | irix6* | nonstopux*) |
4765 | if test "$GCC" = yes; then |
4766 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4767 | + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4768 | # Try to use the -exported_symbol ld option, if it does not |
4769 | # work, assume that -exports_file does not work either and |
4770 | # implicitly export all symbols. |
4771 | @@ -11409,15 +10978,15 @@ |
4772 | int foo(void) {} |
4773 | _ACEOF |
4774 | if ac_fn_c_try_link "$LINENO"; then : |
4775 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
4776 | + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
4777 | |
4778 | fi |
4779 | rm -f core conftest.err conftest.$ac_objext \ |
4780 | conftest$ac_exeext conftest.$ac_ext |
4781 | LDFLAGS="$save_LDFLAGS" |
4782 | else |
4783 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
4784 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
4785 | + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
4786 | + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
4787 | fi |
4788 | archive_cmds_need_lc='no' |
4789 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
4790 | @@ -11479,17 +11048,17 @@ |
4791 | hardcode_libdir_flag_spec='-L$libdir' |
4792 | hardcode_minus_L=yes |
4793 | allow_undefined_flag=unsupported |
4794 | - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' |
4795 | + archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' |
4796 | old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' |
4797 | ;; |
4798 | |
4799 | osf3*) |
4800 | if test "$GCC" = yes; then |
4801 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
4802 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4803 | + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4804 | else |
4805 | allow_undefined_flag=' -expect_unresolved \*' |
4806 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
4807 | + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
4808 | fi |
4809 | archive_cmds_need_lc='no' |
4810 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
4811 | @@ -11499,13 +11068,13 @@ |
4812 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
4813 | if test "$GCC" = yes; then |
4814 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
4815 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4816 | + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4817 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
4818 | else |
4819 | allow_undefined_flag=' -expect_unresolved \*' |
4820 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
4821 | + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
4822 | archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ |
4823 | - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' |
4824 | + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' |
4825 | |
4826 | # Both c and cxx compiler support -rpath directly |
4827 | hardcode_libdir_flag_spec='-rpath $libdir' |
4828 | @@ -11708,44 +11277,50 @@ |
4829 | # to ld, don't add -lc before -lgcc. |
4830 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 |
4831 | $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } |
4832 | - $RM conftest* |
4833 | - echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
4834 | +if test "${lt_cv_archive_cmds_need_lc+set}" = set; then : |
4835 | + $as_echo_n "(cached) " >&6 |
4836 | +else |
4837 | + $RM conftest* |
4838 | + echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
4839 | |
4840 | - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
4841 | + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
4842 | (eval $ac_compile) 2>&5 |
4843 | ac_status=$? |
4844 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
4845 | test $ac_status = 0; } 2>conftest.err; then |
4846 | - soname=conftest |
4847 | - lib=conftest |
4848 | - libobjs=conftest.$ac_objext |
4849 | - deplibs= |
4850 | - wl=$lt_prog_compiler_wl |
4851 | - pic_flag=$lt_prog_compiler_pic |
4852 | - compiler_flags=-v |
4853 | - linker_flags=-v |
4854 | - verstring= |
4855 | - output_objdir=. |
4856 | - libname=conftest |
4857 | - lt_save_allow_undefined_flag=$allow_undefined_flag |
4858 | - allow_undefined_flag= |
4859 | - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 |
4860 | + soname=conftest |
4861 | + lib=conftest |
4862 | + libobjs=conftest.$ac_objext |
4863 | + deplibs= |
4864 | + wl=$lt_prog_compiler_wl |
4865 | + pic_flag=$lt_prog_compiler_pic |
4866 | + compiler_flags=-v |
4867 | + linker_flags=-v |
4868 | + verstring= |
4869 | + output_objdir=. |
4870 | + libname=conftest |
4871 | + lt_save_allow_undefined_flag=$allow_undefined_flag |
4872 | + allow_undefined_flag= |
4873 | + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 |
4874 | (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 |
4875 | ac_status=$? |
4876 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
4877 | test $ac_status = 0; } |
4878 | - then |
4879 | - archive_cmds_need_lc=no |
4880 | - else |
4881 | - archive_cmds_need_lc=yes |
4882 | - fi |
4883 | - allow_undefined_flag=$lt_save_allow_undefined_flag |
4884 | - else |
4885 | - cat conftest.err 1>&5 |
4886 | - fi |
4887 | - $RM conftest* |
4888 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 |
4889 | -$as_echo "$archive_cmds_need_lc" >&6; } |
4890 | + then |
4891 | + lt_cv_archive_cmds_need_lc=no |
4892 | + else |
4893 | + lt_cv_archive_cmds_need_lc=yes |
4894 | + fi |
4895 | + allow_undefined_flag=$lt_save_allow_undefined_flag |
4896 | + else |
4897 | + cat conftest.err 1>&5 |
4898 | + fi |
4899 | + $RM conftest* |
4900 | + |
4901 | +fi |
4902 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 |
4903 | +$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } |
4904 | + archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc |
4905 | ;; |
4906 | esac |
4907 | fi |
4908 | @@ -11916,16 +11491,23 @@ |
4909 | darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; |
4910 | *) lt_awk_arg="/^libraries:/" ;; |
4911 | esac |
4912 | - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
4913 | - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then |
4914 | + case $host_os in |
4915 | + mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; |
4916 | + *) lt_sed_strip_eq="s,=/,/,g" ;; |
4917 | + esac |
4918 | + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` |
4919 | + case $lt_search_path_spec in |
4920 | + *\;*) |
4921 | # if the path contains ";" then we assume it to be the separator |
4922 | # otherwise default to the standard path separator (i.e. ":") - it is |
4923 | # assumed that no part of a normal pathname contains ";" but that should |
4924 | # okay in the real world where ";" in dirpaths is itself problematic. |
4925 | - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` |
4926 | - else |
4927 | - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
4928 | - fi |
4929 | + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` |
4930 | + ;; |
4931 | + *) |
4932 | + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` |
4933 | + ;; |
4934 | + esac |
4935 | # Ok, now we have the path, separated by spaces, we can step through it |
4936 | # and add multilib dir if necessary. |
4937 | lt_tmp_lt_search_path_spec= |
4938 | @@ -11938,7 +11520,7 @@ |
4939 | lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" |
4940 | fi |
4941 | done |
4942 | - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' |
4943 | + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' |
4944 | BEGIN {RS=" "; FS="/|\n";} { |
4945 | lt_foo=""; |
4946 | lt_count=0; |
4947 | @@ -11958,7 +11540,13 @@ |
4948 | if (lt_foo != "") { lt_freq[lt_foo]++; } |
4949 | if (lt_freq[lt_foo] == 1) { print lt_foo; } |
4950 | }'` |
4951 | - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` |
4952 | + # AWK program above erroneously prepends '/' to C:/dos/paths |
4953 | + # for these hosts. |
4954 | + case $host_os in |
4955 | + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ |
4956 | + $SED 's,/\([A-Za-z]:\),\1,g'` ;; |
4957 | + esac |
4958 | + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` |
4959 | else |
4960 | sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" |
4961 | fi |
4962 | @@ -12046,7 +11634,7 @@ |
4963 | m68k) |
4964 | library_names_spec='$libname.ixlibrary $libname.a' |
4965 | # Create ${libname}_ixlibrary.a entries in /sys/libs. |
4966 | - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' |
4967 | + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' |
4968 | ;; |
4969 | esac |
4970 | ;; |
4971 | @@ -12099,23 +11687,12 @@ |
4972 | cygwin*) |
4973 | # Cygwin DLLs use 'cyg' prefix rather than 'lib' |
4974 | soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
4975 | - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" |
4976 | + |
4977 | + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" |
4978 | ;; |
4979 | mingw* | cegcc*) |
4980 | # MinGW DLLs use traditional 'lib' prefix |
4981 | soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
4982 | - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
4983 | - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
4984 | - # It is most probably a Windows format PATH printed by |
4985 | - # mingw gcc, but we are running on Cygwin. Gcc prints its search |
4986 | - # path with ; separators, and with drive letters. We can handle the |
4987 | - # drive letters (cygwin fileutils understands them), so leave them, |
4988 | - # especially as we might pass files found there to a mingw objdump, |
4989 | - # which wouldn't understand a cygwinified path. Ahh. |
4990 | - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
4991 | - else |
4992 | - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
4993 | - fi |
4994 | ;; |
4995 | pw32*) |
4996 | # pw32 DLLs use 'pw' prefix rather than 'lib' |
4997 | @@ -12215,6 +11792,19 @@ |
4998 | hardcode_into_libs=yes |
4999 | ;; |
5000 |
The diff has been truncated for viewing.
Thank you for updating this merge! A few more comments: patches/ webkitglobals_ include. patch is missing DEP-3 headers (missing description entirely)
debian/
It's good to keep patch suffixes consistent (.diff vs .patch)
I think there should be a note in the git commit patch that you removed part of it.