summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-05-18 19:54:00 +0000
committerChristian Grothoff <christian@grothoff.org>2015-05-18 19:54:00 +0000
commit5a8673341a80e189a8f166c079f531a580dd006d (patch)
tree65c153092910cbbf0b6155fb7b90b214c68f8397
parentd432bca57dff61c4c07c133d9b660d2fae2f26b7 (diff)
downloadgnunet-gtk-5a8673341a80e189a8f166c079f531a580dd006d.tar.gz
gnunet-gtk-5a8673341a80e189a8f166c079f531a580dd006d.zip
-libtool and gettext update
Diffstat
-rw-r--r--ABOUT-NLS1956
-rwxr-xr-xconfig.rpath230
-rw-r--r--configure.ac2
-rw-r--r--m4/gettext.m496
-rw-r--r--m4/iconv.m4164
-rw-r--r--m4/intl.m4187
-rw-r--r--m4/lib-ld.m487
-rw-r--r--m4/lib-link.m4138
-rw-r--r--m4/lib-prefix.m491
-rw-r--r--m4/nls.m413
-rw-r--r--m4/po.m440
-rw-r--r--m4/progtest.m431
-rw-r--r--po/ChangeLog5
-rw-r--r--po/Makefile.in.in82
-rw-r--r--po/Rules-quot15
15 files changed, 1876 insertions, 1261 deletions
diff --git a/ABOUT-NLS b/ABOUT-NLS
index 83bc72ec..b1de1b68 100644
--- a/ABOUT-NLS
+++ b/ABOUT-NLS
@@ -18,35 +18,7 @@ explain how users should proceed for getting the programs to use the
18available translations. They tell how people wanting to contribute and 18available translations. They tell how people wanting to contribute and
19work on translations can contact the appropriate team. 19work on translations can contact the appropriate team.
20 20
21 When reporting bugs in the `intl/' directory or bugs which may be 211.1 INSTALL Matters
22related to internationalization, you should tell about the version of
23`gettext' which is used. The information can be found in the
24`intl/VERSION' file, in internationalized packages.
25
261.1 Quick configuration advice
27==============================
28
29If you want to exploit the full power of internationalization, you
30should configure it using
31
32 ./configure --with-included-gettext
33
34to force usage of internationalizing routines provided within this
35package, despite the existence of internationalizing capabilities in the
36operating system where this package is being installed. So far, only
37the `gettext' implementation in the GNU C library version 2 provides as
38many features (such as locale alias, message inheritance, automatic
39charset conversion or plural form handling) as the implementation here.
40It is also not possible to offer this additional functionality on top
41of a `catgets' implementation. Future versions of GNU `gettext' will
42very likely convey even more functionality. So it might be a good idea
43to change to GNU `gettext' as soon as possible.
44
45 So you need _not_ provide this option if you are using GNU libc 2 or
46you have installed a recent copy of the GNU gettext package with the
47included `libintl'.
48
491.2 INSTALL Matters
50=================== 22===================
51 23
52Some packages are "localizable" when properly installed; the programs 24Some packages are "localizable" when properly installed; the programs
@@ -56,36 +28,19 @@ internationalization, predating GNU `gettext'.
56 28
57 By default, this package will be installed to allow translation of 29 By default, this package will be installed to allow translation of
58messages. It will automatically detect whether the system already 30messages. It will automatically detect whether the system already
59provides the GNU `gettext' functions. If not, the included GNU 31provides the GNU `gettext' functions. Installers may use special
60`gettext' library will be used. This library is wholly contained 32options at configuration time for changing the default behaviour. The
61within this package, usually in the `intl/' subdirectory, so prior 33command:
62installation of the GNU `gettext' package is _not_ required.
63Installers may use special options at configuration time for changing
64the default behaviour. The commands:
65 34
66 ./configure --with-included-gettext
67 ./configure --disable-nls 35 ./configure --disable-nls
68 36
69will, respectively, bypass any pre-existing `gettext' to use the 37will _totally_ disable translation of messages.
70internationalizing routines provided within this package, or else,
71_totally_ disable translation of messages.
72 38
73 When you already have GNU `gettext' installed on your system and run 39 When you already have GNU `gettext' installed on your system and run
74configure without an option for your new package, `configure' will 40configure without an option for your new package, `configure' will
75probably detect the previously built and installed `libintl.a' file and 41probably detect the previously built and installed `libintl' library
76will decide to use this. This might not be desirable. You should use 42and will decide to use it. If not, you may have to to use the
77the more recent version of the GNU `gettext' library. I.e. if the file 43`--with-libintl-prefix' option to tell `configure' where to look for it.
78`intl/VERSION' shows that the library which comes with this package is
79more recent, you should use
80
81 ./configure --with-included-gettext
82
83to prevent auto-detection.
84
85 The configuration process will not test for the `catgets' function
86and therefore it will not be used. The reason is that even an
87emulation of `gettext' on top of `catgets' could not provide all the
88extensions of the GNU `gettext' library.
89 44
90 Internationalized packages usually have many `po/LL.po' files, where 45 Internationalized packages usually have many `po/LL.po' files, where
91LL gives an ISO 639 two-letter code identifying the language. Unless 46LL gives an ISO 639 two-letter code identifying the language. Unless
@@ -96,7 +51,7 @@ may be set, prior to configuration, to limit the installed set.
96`LINGUAS' should then contain a space separated list of two-letter 51`LINGUAS' should then contain a space separated list of two-letter
97codes, stating which languages are allowed. 52codes, stating which languages are allowed.
98 53
991.3 Using This Package 541.2 Using This Package
100====================== 55======================
101 56
102As a user, if your language has been installed for this package, you 57As a user, if your language has been installed for this package, you
@@ -148,7 +103,7 @@ to denote the language's main dialect. For example, `de' is equivalent
148to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' 103to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
149(Portuguese as spoken in Portugal) in this context. 104(Portuguese as spoken in Portugal) in this context.
150 105
1511.4 Translating Teams 1061.3 Translating Teams
152===================== 107=====================
153 108
154For the Free Translation Project to be a success, we need interested 109For the Free Translation Project to be a success, we need interested
@@ -177,859 +132,1118 @@ reach the coordinator for all translator teams.
177the terminology in use. Proven linguistic skills are praised more than 132the terminology in use. Proven linguistic skills are praised more than
178programming skills, here. 133programming skills, here.
179 134
1801.5 Available Packages 1351.4 Available Packages
181====================== 136======================
182 137
183Languages are not equally supported in all packages. The following 138Languages are not equally supported in all packages. The following
184matrix shows the current state of internationalization, as of November 139matrix shows the current state of internationalization, as of June
1852007. The matrix shows, in regard of each package, for which languages 1402010. The matrix shows, in regard of each package, for which languages
186PO files have been submitted to translation coordination, with a 141PO files have been submitted to translation coordination, with a
187translation percentage of at least 50%. 142translation percentage of at least 50%.
188 143
189 Ready PO files af am ar az be bg bs ca cs cy da de el en en_GB eo 144 Ready PO files af am an ar as ast az be be@latin bg bn_IN bs ca
190 +----------------------------------------------------+
191 Compendium | [] [] [] [] |
192 a2ps | [] [] [] [] [] |
193 aegis | () |
194 ant-phone | () |
195 anubis | [] |
196 ap-utils | |
197 aspell | [] [] [] [] [] |
198 bash | [] |
199 bfd | |
200 bibshelf | [] |
201 binutils | |
202 bison | [] [] |
203 bison-runtime | [] |
204 bluez-pin | [] [] [] [] [] |
205 cflow | [] |
206 clisp | [] [] [] |
207 console-tools | [] [] |
208 coreutils | [] [] [] [] |
209 cpio | |
210 cpplib | [] [] [] |
211 cryptonit | [] |
212 dialog | |
213 diffutils | [] [] [] [] [] [] |
214 doodle | [] |
215 e2fsprogs | [] [] |
216 enscript | [] [] [] [] |
217 fetchmail | [] [] () [] [] |
218 findutils | [] |
219 findutils_stable | [] [] [] |
220 flex | [] [] [] |
221 fslint | |
222 gas | |
223 gawk | [] [] [] |
224 gcal | [] |
225 gcc | [] |
226 gettext-examples | [] [] [] [] [] |
227 gettext-runtime | [] [] [] [] [] |
228 gettext-tools | [] [] |
229 gip | [] |
230 gliv | [] [] |
231 glunarclock | [] |
232 gmult | [] [] |
233 gnubiff | () |
234 gnucash | [] [] () () [] |
235 gnuedu | |
236 gnulib | [] |
237 gnunet | |
238 gnunet-gtk | |
239 gnutls | [] |
240 gpe-aerial | [] [] |
241 gpe-beam | [] [] |
242 gpe-calendar | |
243 gpe-clock | [] [] |
244 gpe-conf | [] [] |
245 gpe-contacts | |
246 gpe-edit | [] |
247 gpe-filemanager | |
248 gpe-go | [] |
249 gpe-login | [] [] |
250 gpe-ownerinfo | [] [] |
251 gpe-package | |
252 gpe-sketchbook | [] [] |
253 gpe-su | [] [] |
254 gpe-taskmanager | [] [] |
255 gpe-timesheet | [] |
256 gpe-today | [] [] |
257 gpe-todo | |
258 gphoto2 | [] [] [] [] |
259 gprof | [] [] |
260 gpsdrive | |
261 gramadoir | [] [] |
262 grep | [] [] |
263 gretl | () |
264 gsasl | |
265 gss | |
266 gst-plugins-bad | [] [] |
267 gst-plugins-base | [] [] |
268 gst-plugins-good | [] [] [] |
269 gst-plugins-ugly | [] [] |
270 gstreamer | [] [] [] [] [] [] [] |
271 gtick | () |
272 gtkam | [] [] [] [] |
273 gtkorphan | [] [] |
274 gtkspell | [] [] [] [] |
275 gutenprint | [] |
276 hello | [] [] [] [] [] |
277 herrie | [] |
278 hylafax | |
279 idutils | [] [] |
280 indent | [] [] [] [] |
281 iso_15924 | |
282 iso_3166 | [] [] [] [] [] [] [] [] [] [] [] |
283 iso_3166_2 | |
284 iso_4217 | [] [] [] |
285 iso_639 | [] [] [] [] |
286 jpilot | [] |
287 jtag | |
288 jwhois | |
289 kbd | [] [] [] [] |
290 keytouch | [] [] |
291 keytouch-editor | [] |
292 keytouch-keyboa... | [] |
293 latrine | () |
294 ld | [] |
295 leafpad | [] [] [] [] [] |
296 libc | [] [] [] [] |
297 libexif | [] |
298 libextractor | [] |
299 libgpewidget | [] [] [] |
300 libgpg-error | [] |
301 libgphoto2 | [] [] |
302 libgphoto2_port | [] [] |
303 libgsasl | |
304 libiconv | [] [] |
305 libidn | [] [] [] |
306 lifelines | [] () |
307 lilypond | [] |
308 lingoteach | |
309 lprng | |
310 lynx | [] [] [] [] |
311 m4 | [] [] [] [] |
312 mailfromd | |
313 mailutils | [] |
314 make | [] [] |
315 man-db | [] [] [] |
316 minicom | [] [] [] |
317 nano | [] [] [] |
318 opcodes | [] |
319 parted | [] [] |
320 pilot-qof | |
321 popt | [] [] [] |
322 psmisc | [] |
323 pwdutils | |
324 qof | |
325 radius | [] |
326 recode | [] [] [] [] [] [] |
327 rpm | [] |
328 screem | |
329 scrollkeeper | [] [] [] [] [] [] [] [] |
330 sed | [] [] [] |
331 shared-mime-info | [] [] [] [] () [] [] [] |
332 sharutils | [] [] [] [] [] [] |
333 shishi | |
334 skencil | [] () |
335 solfege | |
336 soundtracker | [] [] |
337 sp | [] |
338 system-tools-ba... | [] [] [] [] [] [] [] [] [] |
339 tar | [] [] |
340 texinfo | [] [] [] |
341 tin | () () |
342 tuxpaint | [] [] [] [] [] [] |
343 unicode-han-tra... | |
344 unicode-transla... | |
345 util-linux | [] [] [] [] |
346 util-linux-ng | [] [] [] [] |
347 vorbis-tools | [] |
348 wastesedge | () |
349 wdiff | [] [] [] [] |
350 wget | [] [] [] |
351 xchat | [] [] [] [] [] [] [] |
352 xkeyboard-config | [] |
353 xpad | [] [] [] |
354 +----------------------------------------------------+
355 af am ar az be bg bs ca cs cy da de el en en_GB eo
356 6 0 2 1 8 26 2 40 48 2 56 88 15 1 15 18
357
358 es et eu fa fi fr ga gl gu he hi hr hu id is it
359 +--------------------------------------------------+ 145 +--------------------------------------------------+
360 Compendium | [] [] [] [] [] | 146 a2ps | [] [] |
361 a2ps | [] [] [] () |
362 aegis | | 147 aegis | |
363 ant-phone | [] | 148 ant-phone | |
364 anubis | [] | 149 anubis | |
365 ap-utils | [] [] | 150 aspell | [] [] |
366 aspell | [] [] [] | 151 bash | |
367 bash | [] |
368 bfd | [] [] |
369 bibshelf | [] [] [] |
370 binutils | [] [] [] |
371 bison | [] [] [] [] [] [] |
372 bison-runtime | [] [] [] [] [] |
373 bluez-pin | [] [] [] [] [] |
374 cflow | [] |
375 clisp | [] [] |
376 console-tools | |
377 coreutils | [] [] [] [] [] [] |
378 cpio | [] [] [] |
379 cpplib | [] [] |
380 cryptonit | [] |
381 dialog | [] [] [] |
382 diffutils | [] [] [] [] [] [] [] [] [] |
383 doodle | [] [] |
384 e2fsprogs | [] [] [] |
385 enscript | [] [] [] |
386 fetchmail | [] |
387 findutils | [] [] [] |
388 findutils_stable | [] [] [] [] |
389 flex | [] [] [] |
390 fslint | |
391 gas | [] [] |
392 gawk | [] [] [] [] () |
393 gcal | [] [] |
394 gcc | [] |
395 gettext-examples | [] [] [] [] [] [] [] |
396 gettext-runtime | [] [] [] [] [] [] |
397 gettext-tools | [] [] [] [] |
398 gip | [] [] [] [] |
399 gliv | () |
400 glunarclock | [] [] [] |
401 gmult | [] [] [] |
402 gnubiff | () () |
403 gnucash | () () () |
404 gnuedu | [] |
405 gnulib | [] [] [] |
406 gnunet | |
407 gnunet-gtk | |
408 gnutls | |
409 gpe-aerial | [] [] |
410 gpe-beam | [] [] |
411 gpe-calendar | |
412 gpe-clock | [] [] [] [] |
413 gpe-conf | [] |
414 gpe-contacts | [] [] |
415 gpe-edit | [] [] [] [] |
416 gpe-filemanager | [] |
417 gpe-go | [] [] [] |
418 gpe-login | [] [] [] |
419 gpe-ownerinfo | [] [] [] [] [] |
420 gpe-package | [] |
421 gpe-sketchbook | [] [] |
422 gpe-su | [] [] [] [] |
423 gpe-taskmanager | [] [] [] |
424 gpe-timesheet | [] [] [] [] |
425 gpe-today | [] [] [] [] |
426 gpe-todo | [] |
427 gphoto2 | [] [] [] [] [] |
428 gprof | [] [] [] [] [] |
429 gpsdrive | [] |
430 gramadoir | [] [] |
431 grep | [] [] [] |
432 gretl | [] [] [] () |
433 gsasl | [] [] |
434 gss | [] [] |
435 gst-plugins-bad | [] [] [] [] |
436 gst-plugins-base | [] [] [] [] |
437 gst-plugins-good | [] [] [] [] [] |
438 gst-plugins-ugly | [] [] [] [] |
439 gstreamer | [] [] [] |
440 gtick | [] [] [] |
441 gtkam | [] [] [] [] |
442 gtkorphan | [] [] |
443 gtkspell | [] [] [] [] [] [] [] |
444 gutenprint | [] |
445 hello | [] [] [] [] [] [] [] [] [] [] [] [] [] |
446 herrie | [] |
447 hylafax | |
448 idutils | [] [] [] [] [] |
449 indent | [] [] [] [] [] [] [] [] [] [] |
450 iso_15924 | [] |
451 iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] |
452 iso_3166_2 | [] |
453 iso_4217 | [] [] [] [] [] [] |
454 iso_639 | [] [] [] [] [] [] |
455 jpilot | [] [] |
456 jtag | [] |
457 jwhois | [] [] [] [] [] |
458 kbd | [] [] |
459 keytouch | [] [] [] |
460 keytouch-editor | [] |
461 keytouch-keyboa... | [] [] |
462 latrine | [] [] |
463 ld | [] [] [] [] |
464 leafpad | [] [] [] [] [] [] |
465 libc | [] [] [] [] [] |
466 libexif | [] |
467 libextractor | [] |
468 libgpewidget | [] [] [] [] [] |
469 libgpg-error | [] |
470 libgphoto2 | [] [] [] |
471 libgphoto2_port | [] [] |
472 libgsasl | [] [] |
473 libiconv | [] [] [] |
474 libidn | [] [] |
475 lifelines | () |
476 lilypond | [] [] [] |
477 lingoteach | [] [] [] |
478 lprng | |
479 lynx | [] [] [] |
480 m4 | [] [] [] [] |
481 mailfromd | |
482 mailutils | [] [] |
483 make | [] [] [] [] [] [] [] [] |
484 man-db | [] |
485 minicom | [] [] [] [] |
486 nano | [] [] [] [] [] [] [] |
487 opcodes | [] [] [] [] |
488 parted | [] [] [] |
489 pilot-qof | |
490 popt | [] [] [] [] |
491 psmisc | [] [] |
492 pwdutils | |
493 qof | [] |
494 radius | [] [] |
495 recode | [] [] [] [] [] [] [] [] |
496 rpm | [] [] |
497 screem | |
498 scrollkeeper | [] [] [] |
499 sed | [] [] [] [] [] |
500 shared-mime-info | [] [] [] [] [] [] |
501 sharutils | [] [] [] [] [] [] [] [] |
502 shishi | [] |
503 skencil | [] [] |
504 solfege | [] |
505 soundtracker | [] [] [] |
506 sp | [] |
507 system-tools-ba... | [] [] [] [] [] [] [] [] [] |
508 tar | [] [] [] [] [] |
509 texinfo | [] [] [] |
510 tin | [] () |
511 tuxpaint | [] [] |
512 unicode-han-tra... | |
513 unicode-transla... | [] [] |
514 util-linux | [] [] [] [] [] [] [] |
515 util-linux-ng | [] [] [] [] [] [] [] |
516 vorbis-tools | |
517 wastesedge | () |
518 wdiff | [] [] [] [] [] [] [] [] |
519 wget | [] [] [] [] [] [] [] [] |
520 xchat | [] [] [] [] [] [] [] |
521 xkeyboard-config | [] [] [] [] |
522 xpad | [] [] [] |
523 +--------------------------------------------------+
524 es et eu fa fi fr ga gl gu he hi hr hu id is it
525 85 22 14 2 48 101 61 12 2 8 2 6 53 29 1 52
526
527 ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn
528 +--------------------------------------------------+
529 Compendium | [] |
530 a2ps | () [] [] |
531 aegis | () |
532 ant-phone | [] |
533 anubis | [] [] [] |
534 ap-utils | [] |
535 aspell | [] [] |
536 bash | [] |
537 bfd | | 152 bfd | |
538 bibshelf | [] | 153 bibshelf | [] |
539 binutils | | 154 binutils | |
540 bison | [] [] [] | 155 bison | |
541 bison-runtime | [] [] [] | 156 bison-runtime | [] |
542 bluez-pin | [] [] [] | 157 bluez-pin | [] [] |
158 bombono-dvd | |
159 buzztard | |
543 cflow | | 160 cflow | |
544 clisp | [] | 161 clisp | |
545 console-tools | | 162 coreutils | [] [] |
546 coreutils | [] | 163 cpio | |
547 cpio | [] | 164 cppi | |
548 cpplib | [] | 165 cpplib | [] |
549 cryptonit | [] | 166 cryptsetup | |
550 dialog | [] [] | 167 dfarc | |
551 diffutils | [] [] [] | 168 dialog | [] [] |
169 dico | |
170 diffutils | [] |
171 dink | |
552 doodle | | 172 doodle | |
553 e2fsprogs | [] | 173 e2fsprogs | [] |
554 enscript | [] | 174 enscript | [] |
555 fetchmail | [] [] | 175 exif | |
556 findutils | [] | 176 fetchmail | [] |
557 findutils_stable | [] | 177 findutils | [] |
558 flex | [] [] | 178 flex | [] |
559 fslint | | 179 freedink | |
560 gas | | 180 gas | |
561 gawk | [] [] | 181 gawk | [] [] |
562 gcal | | 182 gcal | [] |
563 gcc | | 183 gcc | |
564 gettext-examples | [] [] [] | 184 gettext-examples | [] [] [] [] |
565 gettext-runtime | [] [] [] | 185 gettext-runtime | [] [] |
566 gettext-tools | [] [] | 186 gettext-tools | [] [] |
567 gip | [] [] | 187 gip | [] |
568 gliv | [] | 188 gjay | |
569 glunarclock | [] [] | 189 gliv | [] |
570 gmult | [] [] [] | 190 glunarclock | [] [] |
571 gnubiff | | 191 gnubiff | |
572 gnucash | () () () | 192 gnucash | [] |
573 gnuedu | | 193 gnuedu | |
574 gnulib | [] [] | 194 gnulib | |
575 gnunet | | 195 gnunet | |
576 gnunet-gtk | | 196 gnunet-gtk | |
577 gnutls | [] | 197 gnutls | |
578 gpe-aerial | [] | 198 gold | |
579 gpe-beam | [] | 199 gpe-aerial | |
580 gpe-calendar | [] | 200 gpe-beam | |
581 gpe-clock | [] [] [] | 201 gpe-bluetooth | |
582 gpe-conf | [] [] [] | 202 gpe-calendar | |
583 gpe-contacts | [] | 203 gpe-clock | [] |
584 gpe-edit | [] [] [] | 204 gpe-conf | |
585 gpe-filemanager | [] [] | 205 gpe-contacts | |
586 gpe-go | [] [] [] | 206 gpe-edit | |
587 gpe-login | [] [] [] | 207 gpe-filemanager | |
588 gpe-ownerinfo | [] [] | 208 gpe-go | |
589 gpe-package | [] [] | 209 gpe-login | |
590 gpe-sketchbook | [] [] | 210 gpe-ownerinfo | [] |
591 gpe-su | [] [] [] | 211 gpe-package | |
592 gpe-taskmanager | [] [] [] [] | 212 gpe-sketchbook | |
593 gpe-timesheet | [] | 213 gpe-su | [] |
594 gpe-today | [] [] | 214 gpe-taskmanager | [] |
595 gpe-todo | [] | 215 gpe-timesheet | [] |
596 gphoto2 | [] [] | 216 gpe-today | [] |
597 gprof | [] | 217 gpe-todo | |
598 gpsdrive | [] | 218 gphoto2 | |
599 gramadoir | () | 219 gprof | [] |
600 grep | [] [] | 220 gpsdrive | |
601 gretl | | 221 gramadoir | |
602 gsasl | [] | 222 grep | |
223 grub | [] [] |
224 gsasl | |
603 gss | | 225 gss | |
604 gst-plugins-bad | [] | 226 gst-plugins-bad | [] |
605 gst-plugins-base | [] | 227 gst-plugins-base | [] |
606 gst-plugins-good | [] | 228 gst-plugins-good | [] |
607 gst-plugins-ugly | [] | 229 gst-plugins-ugly | [] |
608 gstreamer | [] | 230 gstreamer | [] [] [] |
609 gtick | [] | 231 gtick | |
610 gtkam | [] [] | 232 gtkam | [] |
611 gtkorphan | [] | 233 gtkorphan | [] |
612 gtkspell | [] [] | 234 gtkspell | [] [] [] |
613 gutenprint | [] | 235 gutenprint | |
614 hello | [] [] [] [] [] [] [] | 236 hello | [] |
615 herrie | [] | 237 help2man | |
616 hylafax | | 238 hylafax | |
617 idutils | [] | 239 idutils | |
618 indent | [] [] | 240 indent | [] [] |
619 iso_15924 | [] | 241 iso_15924 | |
620 iso_3166 | [] [] [] [] [] [] [] [] | 242 iso_3166 | [] [] [] [] [] [] [] |
621 iso_3166_2 | [] | 243 iso_3166_2 | |
622 iso_4217 | [] [] [] | 244 iso_4217 | |
623 iso_639 | [] [] [] [] | 245 iso_639 | [] [] [] [] |
624 jpilot | () () | 246 iso_639_3 | |
625 jtag | | 247 jwhois | |
626 jwhois | [] | 248 kbd | |
627 kbd | [] | 249 keytouch | [] |
628 keytouch | [] | 250 keytouch-editor | |
629 keytouch-editor | [] | 251 keytouch-keyboa... | [] |
630 keytouch-keyboa... | | 252 klavaro | [] |
631 latrine | [] | 253 latrine | |
632 ld | | 254 ld | [] |
633 leafpad | [] [] | 255 leafpad | [] [] |
634 libc | [] [] [] | 256 libc | [] [] |
635 libexif | | 257 libexif | () |
636 libextractor | | 258 libextractor | |
637 libgpewidget | [] | 259 libgnutls | |
260 libgpewidget | |
638 libgpg-error | | 261 libgpg-error | |
639 libgphoto2 | [] | 262 libgphoto2 | |
640 libgphoto2_port | [] | 263 libgphoto2_port | |
641 libgsasl | [] | 264 libgsasl | |
642 libiconv | [] | 265 libiconv | [] |
643 libidn | [] [] | 266 libidn | |
644 lifelines | [] | 267 lifelines | |
645 lilypond | [] | 268 liferea | [] [] |
646 lingoteach | [] | 269 lilypond | |
270 linkdr | [] |
271 lordsawar | |
647 lprng | | 272 lprng | |
648 lynx | [] [] | 273 lynx | [] |
649 m4 | [] [] | 274 m4 | |
650 mailfromd | | 275 mailfromd | |
651 mailutils | | 276 mailutils | |
652 make | [] [] [] | 277 make | |
653 man-db | | 278 man-db | |
654 minicom | [] | 279 man-db-manpages | |
655 nano | [] [] [] | 280 minicom | |
656 opcodes | [] | 281 mkisofs | |
657 parted | [] [] | 282 myserver | |
658 pilot-qof | | 283 nano | [] [] |
659 popt | [] [] [] | 284 opcodes | |
660 psmisc | [] [] [] | 285 parted | |
286 pies | |
287 popt | |
288 psmisc | |
289 pspp | [] |
661 pwdutils | | 290 pwdutils | |
662 qof | | 291 radius | [] |
663 radius | | 292 recode | [] [] |
664 recode | [] | 293 rosegarden | |
665 rpm | [] [] | 294 rpm | |
666 screem | [] | 295 rush | |
667 scrollkeeper | [] [] [] [] | 296 sarg | |
668 sed | [] [] | 297 screem | |
669 shared-mime-info | [] [] [] [] [] [] [] | 298 scrollkeeper | [] [] [] |
670 sharutils | [] [] | 299 sed | [] [] |
300 sharutils | [] [] |
671 shishi | | 301 shishi | |
672 skencil | | 302 skencil | |
673 solfege | () () | 303 solfege | |
304 solfege-manual | |
674 soundtracker | | 305 soundtracker | |
675 sp | () | 306 sp | |
676 system-tools-ba... | [] [] [] [] | 307 sysstat | |
677 tar | [] [] [] | 308 tar | [] |
678 texinfo | [] [] | 309 texinfo | |
679 tin | | 310 tin | |
680 tuxpaint | () [] [] |
681 unicode-han-tra... | | 311 unicode-han-tra... | |
682 unicode-transla... | | 312 unicode-transla... | |
683 util-linux | [] [] | 313 util-linux-ng | [] |
684 util-linux-ng | [] [] | 314 vice | |
315 vmm | |
685 vorbis-tools | | 316 vorbis-tools | |
686 wastesedge | [] |
687 wdiff | [] [] |
688 wget | [] [] |
689 xchat | [] [] [] [] |
690 xkeyboard-config | [] [] [] |
691 xpad | [] [] [] |
692 +--------------------------------------------------+
693 ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn
694 51 2 25 3 2 0 6 0 2 2 20 0 11 1 103 6
695
696 or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta
697 +--------------------------------------------------+
698 Compendium | [] [] [] [] [] |
699 a2ps | () [] [] [] [] [] [] |
700 aegis | () () |
701 ant-phone | [] [] |
702 anubis | [] [] [] |
703 ap-utils | () |
704 aspell | [] [] [] |
705 bash | [] [] |
706 bfd | |
707 bibshelf | [] |
708 binutils | [] [] |
709 bison | [] [] [] [] [] |
710 bison-runtime | [] [] [] [] [] |
711 bluez-pin | [] [] [] [] [] [] [] [] [] |
712 cflow | [] |
713 clisp | [] |
714 console-tools | [] |
715 coreutils | [] [] [] [] |
716 cpio | [] [] [] |
717 cpplib | [] |
718 cryptonit | [] [] |
719 dialog | [] |
720 diffutils | [] [] [] [] [] [] |
721 doodle | [] [] |
722 e2fsprogs | [] [] |
723 enscript | [] [] [] [] [] |
724 fetchmail | [] [] [] |
725 findutils | [] [] [] |
726 findutils_stable | [] [] [] [] [] [] |
727 flex | [] [] [] [] [] |
728 fslint | [] |
729 gas | |
730 gawk | [] [] [] [] |
731 gcal | [] |
732 gcc | [] [] |
733 gettext-examples | [] [] [] [] [] [] [] [] |
734 gettext-runtime | [] [] [] [] [] [] [] [] |
735 gettext-tools | [] [] [] [] [] [] [] |
736 gip | [] [] [] [] |
737 gliv | [] [] [] [] [] [] |
738 glunarclock | [] [] [] [] [] [] |
739 gmult | [] [] [] [] |
740 gnubiff | () [] |
741 gnucash | () [] |
742 gnuedu | |
743 gnulib | [] [] [] |
744 gnunet | |
745 gnunet-gtk | [] |
746 gnutls | [] [] |
747 gpe-aerial | [] [] [] [] [] [] [] |
748 gpe-beam | [] [] [] [] [] [] [] |
749 gpe-calendar | [] [] [] [] |
750 gpe-clock | [] [] [] [] [] [] [] [] |
751 gpe-conf | [] [] [] [] [] [] [] |
752 gpe-contacts | [] [] [] [] [] |
753 gpe-edit | [] [] [] [] [] [] [] [] [] |
754 gpe-filemanager | [] [] |
755 gpe-go | [] [] [] [] [] [] [] [] |
756 gpe-login | [] [] [] [] [] [] [] [] |
757 gpe-ownerinfo | [] [] [] [] [] [] [] [] |
758 gpe-package | [] [] |
759 gpe-sketchbook | [] [] [] [] [] [] [] [] |
760 gpe-su | [] [] [] [] [] [] [] [] |
761 gpe-taskmanager | [] [] [] [] [] [] [] [] |
762 gpe-timesheet | [] [] [] [] [] [] [] [] |
763 gpe-today | [] [] [] [] [] [] [] [] |
764 gpe-todo | [] [] [] [] |
765 gphoto2 | [] [] [] [] [] [] |
766 gprof | [] [] [] |
767 gpsdrive | [] [] |
768 gramadoir | [] [] |
769 grep | [] [] [] [] |
770 gretl | [] [] [] |
771 gsasl | [] [] [] |
772 gss | [] [] [] [] |
773 gst-plugins-bad | [] [] [] |
774 gst-plugins-base | [] [] |
775 gst-plugins-good | [] [] |
776 gst-plugins-ugly | [] [] [] |
777 gstreamer | [] [] [] [] |
778 gtick | [] |
779 gtkam | [] [] [] [] [] |
780 gtkorphan | [] |
781 gtkspell | [] [] [] [] [] [] [] [] |
782 gutenprint | [] |
783 hello | [] [] [] [] [] [] [] [] |
784 herrie | [] [] [] |
785 hylafax | |
786 idutils | [] [] [] [] [] |
787 indent | [] [] [] [] [] [] [] |
788 iso_15924 | |
789 iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] |
790 iso_3166_2 | |
791 iso_4217 | [] [] [] [] [] [] [] |
792 iso_639 | [] [] [] [] [] [] [] |
793 jpilot | |
794 jtag | [] |
795 jwhois | [] [] [] [] |
796 kbd | [] [] [] |
797 keytouch | [] |
798 keytouch-editor | [] |
799 keytouch-keyboa... | [] |
800 latrine | |
801 ld | [] |
802 leafpad | [] [] [] [] [] [] |
803 libc | [] [] [] [] |
804 libexif | [] [] |
805 libextractor | [] [] |
806 libgpewidget | [] [] [] [] [] [] [] [] |
807 libgpg-error | [] [] [] |
808 libgphoto2 | [] |
809 libgphoto2_port | [] [] [] |
810 libgsasl | [] [] [] [] |
811 libiconv | [] [] [] |
812 libidn | [] [] () |
813 lifelines | [] [] |
814 lilypond | |
815 lingoteach | [] |
816 lprng | [] |
817 lynx | [] [] [] |
818 m4 | [] [] [] [] [] |
819 mailfromd | [] |
820 mailutils | [] [] [] |
821 make | [] [] [] [] |
822 man-db | [] [] [] [] |
823 minicom | [] [] [] [] [] |
824 nano | [] [] [] [] |
825 opcodes | [] [] |
826 parted | [] |
827 pilot-qof | |
828 popt | [] [] [] [] |
829 psmisc | [] [] |
830 pwdutils | [] [] |
831 qof | [] [] |
832 radius | [] [] |
833 recode | [] [] [] [] [] [] [] |
834 rpm | [] [] [] [] |
835 screem | |
836 scrollkeeper | [] [] [] [] [] [] [] |
837 sed | [] [] [] [] [] [] [] [] [] |
838 shared-mime-info | [] [] [] [] [] [] |
839 sharutils | [] [] [] [] |
840 shishi | [] |
841 skencil | [] [] [] |
842 solfege | [] |
843 soundtracker | [] [] |
844 sp | |
845 system-tools-ba... | [] [] [] [] [] [] [] [] [] |
846 tar | [] [] [] [] |
847 texinfo | [] [] [] [] |
848 tin | () |
849 tuxpaint | [] [] [] [] [] [] |
850 unicode-han-tra... | |
851 unicode-transla... | |
852 util-linux | [] [] [] [] |
853 util-linux-ng | [] [] [] [] |
854 vorbis-tools | [] |
855 wastesedge | | 317 wastesedge | |
856 wdiff | [] [] [] [] [] [] [] | 318 wdiff | |
857 wget | [] [] [] [] | 319 wget | [] [] |
858 xchat | [] [] [] [] [] [] [] | 320 wyslij-po | |
859 xkeyboard-config | [] [] [] | 321 xchat | [] [] [] [] |
860 xpad | [] [] [] | 322 xdg-user-dirs | [] [] [] [] [] [] [] [] [] |
323 xkeyboard-config | [] [] |
861 +--------------------------------------------------+ 324 +--------------------------------------------------+
862 or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta 325 af am an ar as ast az be be@latin bg bn_IN bs ca
863 0 5 77 31 53 4 58 72 3 45 46 9 45 122 3 326 6 0 1 2 3 19 1 10 3 28 3 1 38
327
328 crh cs da de el en en_GB en_ZA eo es et eu fa
329 +-------------------------------------------------+
330 a2ps | [] [] [] [] [] [] [] |
331 aegis | [] [] [] |
332 ant-phone | [] () |
333 anubis | [] [] |
334 aspell | [] [] [] [] [] |
335 bash | [] [] [] |
336 bfd | [] |
337 bibshelf | [] [] [] |
338 binutils | [] |
339 bison | [] [] |
340 bison-runtime | [] [] [] [] |
341 bluez-pin | [] [] [] [] [] [] |
342 bombono-dvd | [] |
343 buzztard | [] [] [] |
344 cflow | [] [] |
345 clisp | [] [] [] [] |
346 coreutils | [] [] [] [] |
347 cpio | |
348 cppi | |
349 cpplib | [] [] [] |
350 cryptsetup | [] |
351 dfarc | [] [] [] |
352 dialog | [] [] [] [] [] |
353 dico | |
354 diffutils | [] [] [] [] [] [] |
355 dink | [] [] [] |
356 doodle | [] |
357 e2fsprogs | [] [] [] |
358 enscript | [] [] [] |
359 exif | () [] [] |
360 fetchmail | [] [] () [] [] [] |
361 findutils | [] [] [] |
362 flex | [] [] |
363 freedink | [] [] [] |
364 gas | [] |
365 gawk | [] [] [] |
366 gcal | [] |
367 gcc | [] [] |
368 gettext-examples | [] [] [] [] |
369 gettext-runtime | [] [] [] [] |
370 gettext-tools | [] [] [] |
371 gip | [] [] [] [] |
372 gjay | [] |
373 gliv | [] [] [] |
374 glunarclock | [] [] |
375 gnubiff | () |
376 gnucash | [] () () () () |
377 gnuedu | [] [] |
378 gnulib | [] [] |
379 gnunet | |
380 gnunet-gtk | [] |
381 gnutls | [] [] |
382 gold | [] |
383 gpe-aerial | [] [] [] [] |
384 gpe-beam | [] [] [] [] |
385 gpe-bluetooth | [] [] |
386 gpe-calendar | [] |
387 gpe-clock | [] [] [] [] |
388 gpe-conf | [] [] [] |
389 gpe-contacts | [] [] [] |
390 gpe-edit | [] [] |
391 gpe-filemanager | [] [] [] |
392 gpe-go | [] [] [] [] |
393 gpe-login | [] [] |
394 gpe-ownerinfo | [] [] [] [] |
395 gpe-package | [] [] [] |
396 gpe-sketchbook | [] [] [] [] |
397 gpe-su | [] [] [] [] |
398 gpe-taskmanager | [] [] [] [] |
399 gpe-timesheet | [] [] [] [] |
400 gpe-today | [] [] [] [] |
401 gpe-todo | [] [] [] |
402 gphoto2 | [] [] () [] [] [] |
403 gprof | [] [] [] |
404 gpsdrive | [] [] [] |
405 gramadoir | [] [] [] |
406 grep | [] |
407 grub | [] [] |
408 gsasl | [] |
409 gss | |
410 gst-plugins-bad | [] [] [] [] [] |
411 gst-plugins-base | [] [] [] [] [] |
412 gst-plugins-good | [] [] [] [] [] [] |
413 gst-plugins-ugly | [] [] [] [] [] [] |
414 gstreamer | [] [] [] [] [] |
415 gtick | [] () [] |
416 gtkam | [] [] () [] [] |
417 gtkorphan | [] [] [] [] |
418 gtkspell | [] [] [] [] [] [] [] |
419 gutenprint | [] [] [] |
420 hello | [] [] [] [] |
421 help2man | [] |
422 hylafax | [] [] |
423 idutils | [] [] |
424 indent | [] [] [] [] [] [] [] |
425 iso_15924 | [] () [] [] |
426 iso_3166 | [] [] [] [] () [] [] [] () |
427 iso_3166_2 | () |
428 iso_4217 | [] [] [] () [] [] |
429 iso_639 | [] [] [] [] () [] [] |
430 iso_639_3 | [] |
431 jwhois | [] |
432 kbd | [] [] [] [] [] |
433 keytouch | [] [] |
434 keytouch-editor | [] [] |
435 keytouch-keyboa... | [] |
436 klavaro | [] [] [] [] |
437 latrine | [] () |
438 ld | [] [] |
439 leafpad | [] [] [] [] [] [] |
440 libc | [] [] [] [] |
441 libexif | [] [] () |
442 libextractor | |
443 libgnutls | [] |
444 libgpewidget | [] [] |
445 libgpg-error | [] [] |
446 libgphoto2 | [] () |
447 libgphoto2_port | [] () [] |
448 libgsasl | |
449 libiconv | [] [] [] [] [] |
450 libidn | [] [] [] |
451 lifelines | [] () |
452 liferea | [] [] [] [] [] |
453 lilypond | [] [] [] |
454 linkdr | [] [] [] |
455 lordsawar | [] |
456 lprng | |
457 lynx | [] [] [] [] |
458 m4 | [] [] [] [] |
459 mailfromd | |
460 mailutils | [] |
461 make | [] [] [] |
462 man-db | |
463 man-db-manpages | |
464 minicom | [] [] [] [] |
465 mkisofs | |
466 myserver | |
467 nano | [] [] [] |
468 opcodes | [] [] |
469 parted | [] [] |
470 pies | |
471 popt | [] [] [] [] [] |
472 psmisc | [] [] [] |
473 pspp | [] |
474 pwdutils | [] |
475 radius | [] |
476 recode | [] [] [] [] [] [] |
477 rosegarden | () () () |
478 rpm | [] [] [] |
479 rush | |
480 sarg | |
481 screem | |
482 scrollkeeper | [] [] [] [] [] |
483 sed | [] [] [] [] [] [] |
484 sharutils | [] [] [] [] |
485 shishi | |
486 skencil | [] () [] |
487 solfege | [] [] [] |
488 solfege-manual | [] [] |
489 soundtracker | [] [] [] |
490 sp | [] |
491 sysstat | [] [] [] |
492 tar | [] [] [] [] |
493 texinfo | [] [] [] |
494 tin | [] [] |
495 unicode-han-tra... | |
496 unicode-transla... | |
497 util-linux-ng | [] [] [] [] |
498 vice | () () |
499 vmm | [] |
500 vorbis-tools | [] [] |
501 wastesedge | [] |
502 wdiff | [] [] |
503 wget | [] [] [] |
504 wyslij-po | |
505 xchat | [] [] [] [] [] |
506 xdg-user-dirs | [] [] [] [] [] [] [] [] [] |
507 xkeyboard-config | [] [] [] [] [] [] |
508 +-------------------------------------------------+
509 crh cs da de el en en_GB en_ZA eo es et eu fa
510 5 64 105 117 18 1 8 0 28 89 18 19 0
511
512 fi fr ga gl gu he hi hr hu hy id is it ja ka kn
513 +----------------------------------------------------+
514 a2ps | [] [] [] [] |
515 aegis | [] [] |
516 ant-phone | [] [] |
517 anubis | [] [] [] [] |
518 aspell | [] [] [] [] |
519 bash | [] [] [] [] |
520 bfd | [] [] [] |
521 bibshelf | [] [] [] [] [] |
522 binutils | [] [] [] |
523 bison | [] [] [] [] |
524 bison-runtime | [] [] [] [] [] [] |
525 bluez-pin | [] [] [] [] [] [] [] [] |
526 bombono-dvd | [] |
527 buzztard | [] |
528 cflow | [] [] [] |
529 clisp | [] |
530 coreutils | [] [] [] [] [] |
531 cpio | [] [] [] [] |
532 cppi | [] [] |
533 cpplib | [] [] [] |
534 cryptsetup | [] [] [] |
535 dfarc | [] [] [] |
536 dialog | [] [] [] [] [] [] [] |
537 dico | |
538 diffutils | [] [] [] [] [] [] [] [] [] |
539 dink | [] |
540 doodle | [] [] |
541 e2fsprogs | [] [] |
542 enscript | [] [] [] [] |
543 exif | [] [] [] [] [] [] |
544 fetchmail | [] [] [] [] |
545 findutils | [] [] [] [] [] [] |
546 flex | [] [] [] |
547 freedink | [] [] [] |
548 gas | [] [] |
549 gawk | [] [] [] [] () [] |
550 gcal | [] |
551 gcc | [] |
552 gettext-examples | [] [] [] [] [] [] [] |
553 gettext-runtime | [] [] [] [] [] [] |
554 gettext-tools | [] [] [] [] |
555 gip | [] [] [] [] [] [] |
556 gjay | [] |
557 gliv | [] () |
558 glunarclock | [] [] [] [] |
559 gnubiff | () [] () |
560 gnucash | () () () () () [] |
561 gnuedu | [] [] |
562 gnulib | [] [] [] [] [] [] |
563 gnunet | |
564 gnunet-gtk | [] |
565 gnutls | [] [] |
566 gold | [] [] |
567 gpe-aerial | [] [] [] |
568 gpe-beam | [] [] [] [] |
569 gpe-bluetooth | [] [] [] [] |
570 gpe-calendar | [] [] |
571 gpe-clock | [] [] [] [] [] |
572 gpe-conf | [] [] [] [] |
573 gpe-contacts | [] [] [] [] |
574 gpe-edit | [] [] [] |
575 gpe-filemanager | [] [] [] [] |
576 gpe-go | [] [] [] [] [] |
577 gpe-login | [] [] [] |
578 gpe-ownerinfo | [] [] [] [] [] |
579 gpe-package | [] [] [] |
580 gpe-sketchbook | [] [] [] [] |
581 gpe-su | [] [] [] [] [] [] |
582 gpe-taskmanager | [] [] [] [] [] |
583 gpe-timesheet | [] [] [] [] [] |
584 gpe-today | [] [] [] [] [] [] [] |
585 gpe-todo | [] [] [] |
586 gphoto2 | [] [] [] [] [] [] |
587 gprof | [] [] [] [] |
588 gpsdrive | [] [] [] |
589 gramadoir | [] [] [] |
590 grep | [] [] |
591 grub | [] [] [] [] |
592 gsasl | [] [] [] [] [] |
593 gss | [] [] [] [] [] |
594 gst-plugins-bad | [] [] [] [] [] [] |
595 gst-plugins-base | [] [] [] [] [] [] |
596 gst-plugins-good | [] [] [] [] [] [] |
597 gst-plugins-ugly | [] [] [] [] [] [] |
598 gstreamer | [] [] [] [] [] |
599 gtick | [] [] [] [] [] |
600 gtkam | [] [] [] [] [] |
601 gtkorphan | [] [] [] |
602 gtkspell | [] [] [] [] [] [] [] [] [] |
603 gutenprint | [] [] [] [] |
604 hello | [] [] [] |
605 help2man | [] [] |
606 hylafax | [] |
607 idutils | [] [] [] [] [] [] |
608 indent | [] [] [] [] [] [] [] [] |
609 iso_15924 | [] () [] [] |
610 iso_3166 | [] () [] [] [] [] [] [] [] [] [] [] |
611 iso_3166_2 | () [] [] [] |
612 iso_4217 | [] () [] [] [] [] |
613 iso_639 | [] () [] [] [] [] [] [] [] |
614 iso_639_3 | () [] [] |
615 jwhois | [] [] [] [] [] |
616 kbd | [] [] |
617 keytouch | [] [] [] [] [] [] |
618 keytouch-editor | [] [] [] [] [] |
619 keytouch-keyboa... | [] [] [] [] [] |
620 klavaro | [] [] |
621 latrine | [] [] [] |
622 ld | [] [] [] [] |
623 leafpad | [] [] [] [] [] [] [] () |
624 libc | [] [] [] [] [] |
625 libexif | [] |
626 libextractor | |
627 libgnutls | [] [] |
628 libgpewidget | [] [] [] [] |
629 libgpg-error | [] [] |
630 libgphoto2 | [] [] [] |
631 libgphoto2_port | [] [] [] |
632 libgsasl | [] [] [] [] [] |
633 libiconv | [] [] [] [] [] [] |
634 libidn | [] [] [] [] |
635 lifelines | () |
636 liferea | [] [] [] [] |
637 lilypond | [] [] |
638 linkdr | [] [] [] [] [] |
639 lordsawar | |
640 lprng | [] |
641 lynx | [] [] [] [] [] |
642 m4 | [] [] [] [] [] [] |
643 mailfromd | |
644 mailutils | [] [] |
645 make | [] [] [] [] [] [] [] [] [] |
646 man-db | [] [] |
647 man-db-manpages | [] |
648 minicom | [] [] [] [] [] |
649 mkisofs | [] [] [] [] |
650 myserver | |
651 nano | [] [] [] [] [] [] |
652 opcodes | [] [] [] [] |
653 parted | [] [] [] [] |
654 pies | |
655 popt | [] [] [] [] [] [] [] [] [] |
656 psmisc | [] [] [] |
657 pspp | |
658 pwdutils | [] [] |
659 radius | [] [] |
660 recode | [] [] [] [] [] [] [] [] |
661 rosegarden | () () () () () |
662 rpm | [] [] |
663 rush | |
664 sarg | [] |
665 screem | [] [] |
666 scrollkeeper | [] [] [] [] |
667 sed | [] [] [] [] [] [] [] [] |
668 sharutils | [] [] [] [] [] [] [] |
669 shishi | [] |
670 skencil | [] |
671 solfege | [] [] [] [] |
672 solfege-manual | [] [] |
673 soundtracker | [] [] |
674 sp | [] () |
675 sysstat | [] [] [] [] [] |
676 tar | [] [] [] [] [] [] [] |
677 texinfo | [] [] [] [] |
678 tin | [] |
679 unicode-han-tra... | |
680 unicode-transla... | [] [] |
681 util-linux-ng | [] [] [] [] [] [] |
682 vice | () () () |
683 vmm | [] |
684 vorbis-tools | [] |
685 wastesedge | () () |
686 wdiff | [] |
687 wget | [] [] [] [] [] [] [] [] |
688 wyslij-po | [] [] [] |
689 xchat | [] [] [] [] [] [] [] [] [] |
690 xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] |
691 xkeyboard-config | [] [] [] [] [] |
692 +----------------------------------------------------+
693 fi fr ga gl gu he hi hr hu hy id is it ja ka kn
694 105 121 53 20 4 8 3 5 53 2 120 5 84 67 0 4
695
696 ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
697 +-----------------------------------------------+
698 a2ps | [] |
699 aegis | |
700 ant-phone | |
701 anubis | [] [] |
702 aspell | [] |
703 bash | |
704 bfd | |
705 bibshelf | [] [] |
706 binutils | |
707 bison | [] |
708 bison-runtime | [] [] [] [] [] |
709 bluez-pin | [] [] [] [] [] |
710 bombono-dvd | |
711 buzztard | |
712 cflow | |
713 clisp | |
714 coreutils | [] |
715 cpio | |
716 cppi | |
717 cpplib | |
718 cryptsetup | |
719 dfarc | [] |
720 dialog | [] [] [] [] [] |
721 dico | |
722 diffutils | [] [] |
723 dink | |
724 doodle | |
725 e2fsprogs | |
726 enscript | |
727 exif | [] |
728 fetchmail | |
729 findutils | |
730 flex | |
731 freedink | [] |
732 gas | |
733 gawk | |
734 gcal | |
735 gcc | |
736 gettext-examples | [] [] [] [] |
737 gettext-runtime | [] |
738 gettext-tools | [] |
739 gip | [] [] |
740 gjay | |
741 gliv | |
742 glunarclock | [] |
743 gnubiff | |
744 gnucash | () () () () |
745 gnuedu | |
746 gnulib | |
747 gnunet | |
748 gnunet-gtk | |
749 gnutls | [] |
750 gold | |
751 gpe-aerial | [] |
752 gpe-beam | [] |
753 gpe-bluetooth | [] [] |
754 gpe-calendar | [] |
755 gpe-clock | [] [] [] [] [] |
756 gpe-conf | [] [] |
757 gpe-contacts | [] [] |
758 gpe-edit | [] |
759 gpe-filemanager | [] [] |
760 gpe-go | [] [] [] |
761 gpe-login | [] |
762 gpe-ownerinfo | [] [] |
763 gpe-package | [] [] |
764 gpe-sketchbook | [] [] |
765 gpe-su | [] [] [] [] [] [] |
766 gpe-taskmanager | [] [] [] [] [] [] |
767 gpe-timesheet | [] [] |
768 gpe-today | [] [] [] [] |
769 gpe-todo | [] [] |
770 gphoto2 | |
771 gprof | [] |
772 gpsdrive | |
773 gramadoir | |
774 grep | |
775 grub | |
776 gsasl | |
777 gss | |
778 gst-plugins-bad | [] [] [] [] |
779 gst-plugins-base | [] [] |
780 gst-plugins-good | [] [] |
781 gst-plugins-ugly | [] [] [] [] [] |
782 gstreamer | |
783 gtick | |
784 gtkam | [] |
785 gtkorphan | [] [] |
786 gtkspell | [] [] [] [] [] [] [] |
787 gutenprint | |
788 hello | [] [] [] |
789 help2man | |
790 hylafax | |
791 idutils | |
792 indent | |
793 iso_15924 | [] [] |
794 iso_3166 | [] [] () [] [] [] [] [] |
795 iso_3166_2 | |
796 iso_4217 | [] [] |
797 iso_639 | [] [] |
798 iso_639_3 | [] |
799 jwhois | [] |
800 kbd | |
801 keytouch | [] |
802 keytouch-editor | [] |
803 keytouch-keyboa... | [] |
804 klavaro | [] |
805 latrine | [] |
806 ld | |
807 leafpad | [] [] [] |
808 libc | [] |
809 libexif | |
810 libextractor | |
811 libgnutls | [] |
812 libgpewidget | [] [] |
813 libgpg-error | |
814 libgphoto2 | |
815 libgphoto2_port | |
816 libgsasl | |
817 libiconv | |
818 libidn | |
819 lifelines | |
820 liferea | |
821 lilypond | |
822 linkdr | |
823 lordsawar | |
824 lprng | |
825 lynx | |
826 m4 | |
827 mailfromd | |
828 mailutils | |
829 make | [] |
830 man-db | |
831 man-db-manpages | |
832 minicom | [] |
833 mkisofs | |
834 myserver | |
835 nano | [] [] |
836 opcodes | |
837 parted | |
838 pies | |
839 popt | [] [] [] |
840 psmisc | |
841 pspp | |
842 pwdutils | |
843 radius | |
844 recode | |
845 rosegarden | |
846 rpm | |
847 rush | |
848 sarg | |
849 screem | |
850 scrollkeeper | [] [] |
851 sed | |
852 sharutils | |
853 shishi | |
854 skencil | |
855 solfege | [] |
856 solfege-manual | |
857 soundtracker | |
858 sp | |
859 sysstat | [] |
860 tar | [] |
861 texinfo | [] |
862 tin | |
863 unicode-han-tra... | |
864 unicode-transla... | |
865 util-linux-ng | |
866 vice | |
867 vmm | |
868 vorbis-tools | |
869 wastesedge | |
870 wdiff | |
871 wget | [] |
872 wyslij-po | |
873 xchat | [] [] [] |
874 xdg-user-dirs | [] [] [] [] [] [] [] [] |
875 xkeyboard-config | [] [] [] |
876 +-----------------------------------------------+
877 ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
878 20 5 10 1 13 48 4 2 2 4 24 10 20 3 1
879
880 nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr
881 +---------------------------------------------------+
882 a2ps | [] [] [] [] [] [] [] [] |
883 aegis | [] [] [] |
884 ant-phone | [] [] |
885 anubis | [] [] [] |
886 aspell | [] [] [] [] [] |
887 bash | [] [] |
888 bfd | [] |
889 bibshelf | [] [] |
890 binutils | [] [] |
891 bison | [] [] [] |
892 bison-runtime | [] [] [] [] [] [] [] |
893 bluez-pin | [] [] [] [] [] [] [] [] |
894 bombono-dvd | [] () |
895 buzztard | [] [] |
896 cflow | [] |
897 clisp | [] [] |
898 coreutils | [] [] [] [] [] [] |
899 cpio | [] [] [] |
900 cppi | [] |
901 cpplib | [] |
902 cryptsetup | [] |
903 dfarc | [] |
904 dialog | [] [] [] [] |
905 dico | [] |
906 diffutils | [] [] [] [] [] [] |
907 dink | () |
908 doodle | [] [] |
909 e2fsprogs | [] [] |
910 enscript | [] [] [] [] [] |
911 exif | [] [] [] () [] |
912 fetchmail | [] [] [] [] |
913 findutils | [] [] [] [] [] |
914 flex | [] [] [] [] [] |
915 freedink | [] [] |
916 gas | |
917 gawk | [] [] [] [] |
918 gcal | |
919 gcc | [] |
920 gettext-examples | [] [] [] [] [] [] [] [] |
921 gettext-runtime | [] [] [] [] [] [] [] [] [] |
922 gettext-tools | [] [] [] [] [] [] |
923 gip | [] [] [] [] [] |
924 gjay | |
925 gliv | [] [] [] [] [] [] |
926 glunarclock | [] [] [] [] [] |
927 gnubiff | [] () |
928 gnucash | [] () () () |
929 gnuedu | [] |
930 gnulib | [] [] [] [] |
931 gnunet | |
932 gnunet-gtk | |
933 gnutls | [] [] |
934 gold | |
935 gpe-aerial | [] [] [] [] [] [] [] |
936 gpe-beam | [] [] [] [] [] [] [] |
937 gpe-bluetooth | [] [] |
938 gpe-calendar | [] [] [] [] |
939 gpe-clock | [] [] [] [] [] [] [] [] |
940 gpe-conf | [] [] [] [] [] [] [] |
941 gpe-contacts | [] [] [] [] [] |
942 gpe-edit | [] [] [] |
943 gpe-filemanager | [] [] [] |
944 gpe-go | [] [] [] [] [] [] [] [] |
945 gpe-login | [] [] |
946 gpe-ownerinfo | [] [] [] [] [] [] [] [] |
947 gpe-package | [] [] |
948 gpe-sketchbook | [] [] [] [] [] [] [] |
949 gpe-su | [] [] [] [] [] [] [] [] |
950 gpe-taskmanager | [] [] [] [] [] [] [] [] |
951 gpe-timesheet | [] [] [] [] [] [] [] [] |
952 gpe-today | [] [] [] [] [] [] [] [] |
953 gpe-todo | [] [] [] [] [] |
954 gphoto2 | [] [] [] [] [] [] [] [] |
955 gprof | [] [] [] |
956 gpsdrive | [] [] |
957 gramadoir | [] [] |
958 grep | [] [] [] [] |
959 grub | [] [] [] |
960 gsasl | [] [] [] [] |
961 gss | [] [] [] |
962 gst-plugins-bad | [] [] [] [] [] [] |
963 gst-plugins-base | [] [] [] [] [] |
964 gst-plugins-good | [] [] [] [] [] |
965 gst-plugins-ugly | [] [] [] [] [] [] |
966 gstreamer | [] [] [] [] [] |
967 gtick | [] [] [] |
968 gtkam | [] [] [] [] [] [] |
969 gtkorphan | [] |
970 gtkspell | [] [] [] [] [] [] [] [] [] [] |
971 gutenprint | [] [] |
972 hello | [] [] [] [] |
973 help2man | [] [] |
974 hylafax | [] |
975 idutils | [] [] [] [] [] |
976 indent | [] [] [] [] [] [] [] |
977 iso_15924 | [] [] [] [] |
978 iso_3166 | [] [] [] [] [] () [] [] [] [] [] [] [] [] |
979 iso_3166_2 | [] [] [] |
980 iso_4217 | [] [] [] [] [] [] [] [] |
981 iso_639 | [] [] [] [] [] [] [] [] [] |
982 iso_639_3 | [] [] |
983 jwhois | [] [] [] [] |
984 kbd | [] [] [] |
985 keytouch | [] [] [] |
986 keytouch-editor | [] [] [] |
987 keytouch-keyboa... | [] [] [] |
988 klavaro | [] [] |
989 latrine | [] [] |
990 ld | |
991 leafpad | [] [] [] [] [] [] [] [] [] |
992 libc | [] [] [] [] |
993 libexif | [] [] () [] |
994 libextractor | |
995 libgnutls | [] [] |
996 libgpewidget | [] [] [] |
997 libgpg-error | [] [] |
998 libgphoto2 | [] [] |
999 libgphoto2_port | [] [] [] [] [] |
1000 libgsasl | [] [] [] [] [] |
1001 libiconv | [] [] [] [] [] |
1002 libidn | [] [] |
1003 lifelines | [] [] |
1004 liferea | [] [] [] [] [] () () [] |
1005 lilypond | [] |
1006 linkdr | [] [] [] |
1007 lordsawar | |
1008 lprng | [] |
1009 lynx | [] [] [] |
1010 m4 | [] [] [] [] [] |
1011 mailfromd | [] |
1012 mailutils | [] |
1013 make | [] [] [] [] |
1014 man-db | [] [] [] |
1015 man-db-manpages | [] [] [] |
1016 minicom | [] [] [] [] |
1017 mkisofs | [] [] [] |
1018 myserver | |
1019 nano | [] [] [] [] |
1020 opcodes | [] [] |
1021 parted | [] [] [] [] |
1022 pies | [] |
1023 popt | [] [] [] [] |
1024 psmisc | [] [] [] |
1025 pspp | [] [] |
1026 pwdutils | [] |
1027 radius | [] [] [] |
1028 recode | [] [] [] [] [] [] [] [] |
1029 rosegarden | () () |
1030 rpm | [] [] [] |
1031 rush | [] [] |
1032 sarg | |
1033 screem | |
1034 scrollkeeper | [] [] [] [] [] [] [] [] |
1035 sed | [] [] [] [] [] [] [] [] [] |
1036 sharutils | [] [] [] [] |
1037 shishi | [] |
1038 skencil | [] [] |
1039 solfege | [] [] [] [] |
1040 solfege-manual | [] [] [] |
1041 soundtracker | [] |
1042 sp | |
1043 sysstat | [] [] [] [] |
1044 tar | [] [] [] [] |
1045 texinfo | [] [] [] [] |
1046 tin | [] |
1047 unicode-han-tra... | |
1048 unicode-transla... | |
1049 util-linux-ng | [] [] [] [] [] |
1050 vice | [] |
1051 vmm | [] |
1052 vorbis-tools | [] [] |
1053 wastesedge | [] |
1054 wdiff | [] [] |
1055 wget | [] [] [] [] [] [] [] |
1056 wyslij-po | [] [] [] |
1057 xchat | [] [] [] [] [] [] [] [] [] |
1058 xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] [] |
1059 xkeyboard-config | [] [] [] |
1060 +---------------------------------------------------+
1061 nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr
1062 135 10 4 7 105 1 29 62 47 91 3 54 46 9 37
864 1063
865 tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu 1064 sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW
866 +---------------------------------------------------+ 1065 +---------------------------------------------------+
867 Compendium | [] [] [] [] | 19 1066 a2ps | [] [] [] [] [] | 27
868 a2ps | [] [] [] | 19 1067 aegis | [] | 9
869 aegis | [] | 1 1068 ant-phone | [] [] [] [] | 9
870 ant-phone | [] [] | 6 1069 anubis | [] [] [] [] | 15
871 anubis | [] [] [] | 11 1070 aspell | [] [] [] | 20
872 ap-utils | () [] | 4 1071 bash | [] [] [] | 12
873 aspell | [] [] [] | 16 1072 bfd | [] | 6
874 bash | [] | 6 1073 bibshelf | [] [] [] | 16
875 bfd | | 2 1074 binutils | [] [] | 8
876 bibshelf | [] | 7 1075 bison | [] [] | 12
877 binutils | [] [] [] [] | 9 1076 bison-runtime | [] [] [] [] [] [] | 29
878 bison | [] [] [] [] | 20 1077 bluez-pin | [] [] [] [] [] [] [] [] | 37
879 bison-runtime | [] [] [] [] | 18 1078 bombono-dvd | [] | 4
880 bluez-pin | [] [] [] [] [] [] | 28 1079 buzztard | [] | 7
881 cflow | [] [] | 5 1080 cflow | [] [] [] | 9
882 clisp | | 9 1081 clisp | | 10
883 console-tools | [] [] | 5 1082 coreutils | [] [] [] [] | 22
884 coreutils | [] [] [] | 18 1083 cpio | [] [] [] [] [] [] | 13
885 cpio | [] [] [] [] | 11 1084 cppi | [] [] | 5
886 cpplib | [] [] [] [] [] | 12 1085 cpplib | [] [] [] [] [] [] | 14
887 cryptonit | [] | 6 1086 cryptsetup | [] [] | 7
888 dialog | [] [] [] | 9 1087 dfarc | [] | 9
889 diffutils | [] [] [] [] [] | 29 1088 dialog | [] [] [] [] [] [] [] | 30
890 doodle | [] | 6 1089 dico | [] | 2
891 e2fsprogs | [] [] | 10 1090 diffutils | [] [] [] [] [] [] | 30
892 enscript | [] [] [] | 16 1091 dink | | 4
893 fetchmail | [] [] | 12 1092 doodle | [] [] | 7
894 findutils | [] [] [] | 11 1093 e2fsprogs | [] [] [] | 11
895 findutils_stable | [] [] [] [] | 18 1094 enscript | [] [] [] [] | 17
896 flex | [] [] | 15 1095 exif | [] [] [] | 16
897 fslint | [] | 2 1096 fetchmail | [] [] [] | 17
898 gas | [] | 3 1097 findutils | [] [] [] [] [] | 20
899 gawk | [] [] [] | 16 1098 flex | [] [] [] [] | 15
900 gcal | [] | 5 1099 freedink | [] | 10
901 gcc | [] [] [] | 7 1100 gas | [] | 4
902 gettext-examples | [] [] [] [] [] [] | 29 1101 gawk | [] [] [] [] | 18
903 gettext-runtime | [] [] [] [] [] [] | 28 1102 gcal | [] [] | 5
904 gettext-tools | [] [] [] [] [] | 20 1103 gcc | [] [] [] | 7
905 gip | [] [] | 13 1104 gettext-examples | [] [] [] [] [] [] [] | 34
906 gliv | [] [] | 11 1105 gettext-runtime | [] [] [] [] [] [] [] | 29
907 glunarclock | [] [] [] | 15 1106 gettext-tools | [] [] [] [] [] [] | 22
908 gmult | [] [] [] [] | 16 1107 gip | [] [] [] [] | 22
909 gnubiff | [] | 2 1108 gjay | [] | 3
910 gnucash | () [] | 5 1109 gliv | [] [] [] | 14
911 gnuedu | [] | 2 1110 glunarclock | [] [] [] [] [] | 19
912 gnulib | [] | 10 1111 gnubiff | [] [] | 4
913 gnunet | | 0 1112 gnucash | () [] () [] () | 10
914 gnunet-gtk | [] [] | 3 1113 gnuedu | [] [] | 7
915 gnutls | | 4 1114 gnulib | [] [] [] [] | 16
916 gpe-aerial | [] [] | 14 1115 gnunet | [] | 1
917 gpe-beam | [] [] | 14 1116 gnunet-gtk | [] [] [] | 5
918 gpe-calendar | [] [] | 7 1117 gnutls | [] [] [] | 10
919 gpe-clock | [] [] [] [] | 21 1118 gold | [] | 4
920 gpe-conf | [] [] [] | 16 1119 gpe-aerial | [] [] [] | 18
921 gpe-contacts | [] [] | 10 1120 gpe-beam | [] [] [] | 19
922 gpe-edit | [] [] [] [] [] | 22 1121 gpe-bluetooth | [] [] [] | 13
923 gpe-filemanager | [] [] | 7 1122 gpe-calendar | [] [] [] [] | 12
924 gpe-go | [] [] [] [] | 19 1123 gpe-clock | [] [] [] [] [] | 28
925 gpe-login | [] [] [] [] [] | 21 1124 gpe-conf | [] [] [] [] | 20
926 gpe-ownerinfo | [] [] [] [] | 21 1125 gpe-contacts | [] [] [] | 17
927 gpe-package | [] | 6 1126 gpe-edit | [] [] [] | 12
928 gpe-sketchbook | [] [] | 16 1127 gpe-filemanager | [] [] [] [] | 16
929 gpe-su | [] [] [] [] | 21 1128 gpe-go | [] [] [] [] [] | 25
930 gpe-taskmanager | [] [] [] [] | 21 1129 gpe-login | [] [] [] | 11
931 gpe-timesheet | [] [] [] [] | 18 1130 gpe-ownerinfo | [] [] [] [] [] | 25
932 gpe-today | [] [] [] [] [] | 21 1131 gpe-package | [] [] [] | 13
933 gpe-todo | [] [] | 8 1132 gpe-sketchbook | [] [] [] | 20
934 gphoto2 | [] [] [] [] | 21 1133 gpe-su | [] [] [] [] [] | 30
935 gprof | [] [] | 13 1134 gpe-taskmanager | [] [] [] [] [] | 29
936 gpsdrive | [] | 5 1135 gpe-timesheet | [] [] [] [] [] | 25
937 gramadoir | [] | 7 1136 gpe-today | [] [] [] [] [] [] | 30
938 grep | [] | 12 1137 gpe-todo | [] [] [] [] | 17
939 gretl | | 6 1138 gphoto2 | [] [] [] [] [] | 24
940 gsasl | [] [] [] | 9 1139 gprof | [] [] [] | 15
941 gss | [] | 7 1140 gpsdrive | [] [] [] | 11
942 gst-plugins-bad | [] [] [] | 13 1141 gramadoir | [] [] [] | 11
943 gst-plugins-base | [] [] | 11 1142 grep | [] [] [] | 10
944 gst-plugins-good | [] [] [] [] [] | 16 1143 grub | [] [] [] | 14
945 gst-plugins-ugly | [] [] [] | 13 1144 gsasl | [] [] [] [] | 14
946 gstreamer | [] [] [] | 18 1145 gss | [] [] [] | 11
947 gtick | [] [] | 7 1146 gst-plugins-bad | [] [] [] [] | 26
948 gtkam | [] | 16 1147 gst-plugins-base | [] [] [] [] [] | 24
949 gtkorphan | [] | 7 1148 gst-plugins-good | [] [] [] [] | 24
950 gtkspell | [] [] [] [] [] [] | 27 1149 gst-plugins-ugly | [] [] [] [] [] | 29
951 gutenprint | | 4 1150 gstreamer | [] [] [] [] | 22
952 hello | [] [] [] [] [] | 38 1151 gtick | [] [] [] | 13
953 herrie | [] [] | 8 1152 gtkam | [] [] [] | 20
954 hylafax | | 0 1153 gtkorphan | [] [] [] | 14
955 idutils | [] [] | 15 1154 gtkspell | [] [] [] [] [] [] [] [] [] | 45
956 indent | [] [] [] [] [] | 28 1155 gutenprint | [] | 10
957 iso_15924 | [] [] | 4 1156 hello | [] [] [] [] [] [] | 21
958 iso_3166 | [] [] [] [] [] [] [] [] [] | 54 1157 help2man | [] [] | 7
959 iso_3166_2 | [] [] | 4 1158 hylafax | [] | 5
960 iso_4217 | [] [] [] [] [] | 24 1159 idutils | [] [] [] [] | 17
961 iso_639 | [] [] [] [] [] | 26 1160 indent | [] [] [] [] [] [] | 30
962 jpilot | [] [] [] [] | 7 1161 iso_15924 | () [] () [] [] | 16
963 jtag | [] | 3 1162 iso_3166 | [] [] () [] [] () [] [] [] () | 53
964 jwhois | [] [] [] | 13 1163 iso_3166_2 | () [] () [] | 9
965 kbd | [] [] [] | 13 1164 iso_4217 | [] () [] [] () [] [] | 26
966 keytouch | [] | 8 1165 iso_639 | [] [] [] () [] () [] [] [] [] | 38
967 keytouch-editor | [] | 5 1166 iso_639_3 | [] () | 8
968 keytouch-keyboa... | [] | 5 1167 jwhois | [] [] [] [] [] | 16
969 latrine | [] [] | 5 1168 kbd | [] [] [] [] [] | 15
970 ld | [] [] [] [] | 10 1169 keytouch | [] [] [] | 16
971 leafpad | [] [] [] [] [] | 24 1170 keytouch-editor | [] [] [] | 14
972 libc | [] [] [] | 19 1171 keytouch-keyboa... | [] [] [] | 14
973 libexif | [] | 5 1172 klavaro | [] | 11
974 libextractor | [] | 5 1173 latrine | [] [] [] | 10
975 libgpewidget | [] [] [] | 20 1174 ld | [] [] [] [] | 11
976 libgpg-error | [] | 6 1175 leafpad | [] [] [] [] [] [] | 33
977 libgphoto2 | [] [] | 9 1176 libc | [] [] [] [] [] | 21
978 libgphoto2_port | [] [] [] | 11 1177 libexif | [] () | 7
979 libgsasl | [] | 8 1178 libextractor | [] | 1
980 libiconv | [] [] | 11 1179 libgnutls | [] [] [] | 9
981 libidn | [] [] | 11 1180 libgpewidget | [] [] [] | 14
982 lifelines | | 4 1181 libgpg-error | [] [] [] | 9
983 lilypond | [] | 6 1182 libgphoto2 | [] [] | 8
984 lingoteach | [] | 6 1183 libgphoto2_port | [] [] [] [] | 14
985 lprng | [] | 2 1184 libgsasl | [] [] [] | 13
986 lynx | [] [] [] | 15 1185 libiconv | [] [] [] [] | 21
987 m4 | [] [] [] | 18 1186 libidn | () [] [] | 11
988 mailfromd | [] [] | 3 1187 lifelines | [] | 4
989 mailutils | [] [] | 8 1188 liferea | [] [] [] | 21
990 make | [] [] [] | 20 1189 lilypond | [] | 7
991 man-db | [] | 9 1190 linkdr | [] [] [] [] [] | 17
992 minicom | [] | 14 1191 lordsawar | | 1
993 nano | [] [] [] | 20 1192 lprng | [] | 3
994 opcodes | [] [] | 10 1193 lynx | [] [] [] [] | 17
995 parted | [] [] [] | 11 1194 m4 | [] [] [] [] | 19
996 pilot-qof | [] | 1 1195 mailfromd | [] [] | 3
997 popt | [] [] [] [] | 18 1196 mailutils | [] | 5
998 psmisc | [] [] | 10 1197 make | [] [] [] [] | 21
999 pwdutils | [] | 3 1198 man-db | [] [] [] | 8
1000 qof | [] | 4 1199 man-db-manpages | | 4
1001 radius | [] [] | 7 1200 minicom | [] [] | 16
1002 recode | [] [] [] | 25 1201 mkisofs | [] [] | 9
1003 rpm | [] [] [] [] | 13 1202 myserver | | 0
1004 screem | [] | 2 1203 nano | [] [] [] [] | 21
1005 scrollkeeper | [] [] [] [] | 26 1204 opcodes | [] [] [] | 11
1006 sed | [] [] [] [] | 23 1205 parted | [] [] [] [] [] | 15
1007 shared-mime-info | [] [] [] | 29 1206 pies | [] [] | 3
1008 sharutils | [] [] [] | 23 1207 popt | [] [] [] [] [] [] | 27
1009 shishi | [] | 3 1208 psmisc | [] [] | 11
1010 skencil | [] | 7 1209 pspp | | 4
1011 solfege | [] | 3 1210 pwdutils | [] [] | 6
1012 soundtracker | [] [] | 9 1211 radius | [] [] | 9
1013 sp | [] | 3 1212 recode | [] [] [] [] | 28
1014 system-tools-ba... | [] [] [] [] [] [] [] | 38 1213 rosegarden | () | 0
1015 tar | [] [] [] | 17 1214 rpm | [] [] [] | 11
1016 texinfo | [] [] [] | 15 1215 rush | [] [] | 4
1017 tin | | 1 1216 sarg | | 1
1018 tuxpaint | [] [] [] | 19 1217 screem | [] | 3
1218 scrollkeeper | [] [] [] [] [] | 27
1219 sed | [] [] [] [] [] | 30
1220 sharutils | [] [] [] [] [] | 22
1221 shishi | [] | 3
1222 skencil | [] [] | 7
1223 solfege | [] [] [] [] | 16
1224 solfege-manual | [] | 8
1225 soundtracker | [] [] [] | 9
1226 sp | [] | 3
1227 sysstat | [] [] | 15
1228 tar | [] [] [] [] [] [] | 23
1229 texinfo | [] [] [] [] [] | 17
1230 tin | | 4
1019 unicode-han-tra... | | 0 1231 unicode-han-tra... | | 0
1020 unicode-transla... | | 2 1232 unicode-transla... | | 2
1021 util-linux | [] [] [] | 20 1233 util-linux-ng | [] [] [] [] | 20
1022 util-linux-ng | [] [] [] | 20 1234 vice | () () | 1
1023 vorbis-tools | [] [] | 4 1235 vmm | [] | 4
1024 wastesedge | | 1 1236 vorbis-tools | [] | 6
1025 wdiff | [] [] | 23 1237 wastesedge | | 2
1026 wget | [] [] [] | 20 1238 wdiff | [] [] | 7
1027 xchat | [] [] [] [] | 29 1239 wget | [] [] [] [] [] | 26
1028 xkeyboard-config | [] [] [] | 14 1240 wyslij-po | [] [] | 8
1029 xpad | [] [] [] | 15 1241 xchat | [] [] [] [] [] [] | 36
1242 xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] | 63
1243 xkeyboard-config | [] [] [] | 22
1030 +---------------------------------------------------+ 1244 +---------------------------------------------------+
1031 76 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu 1245 85 teams sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW
1032 163 domains 0 3 1 74 51 0 143 21 1 57 7 45 0 2036 1246 178 domains 119 1 3 3 0 10 65 51 155 17 98 7 41 2618
1033 1247
1034 Some counters in the preceding matrix are higher than the number of 1248 Some counters in the preceding matrix are higher than the number of
1035visible blocks let us expect. This is because a few extra PO files are 1249visible blocks let us expect. This is because a few extra PO files are
@@ -1042,12 +1256,12 @@ distributed as such by its maintainer. There might be an observable
1042lag between the mere existence a PO file and its wide availability in a 1256lag between the mere existence a PO file and its wide availability in a
1043distribution. 1257distribution.
1044 1258
1045 If November 2007 seems to be old, you may fetch a more recent copy 1259 If June 2010 seems to be old, you may fetch a more recent copy of
1046of this `ABOUT-NLS' file on most GNU archive sites. The most 1260this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date
1047up-to-date matrix with full percentage details can be found at 1261matrix with full percentage details can be found at
1048`http://translationproject.org/extra/matrix.html'. 1262`http://translationproject.org/extra/matrix.html'.
1049 1263
10501.6 Using `gettext' in new packages 12641.5 Using `gettext' in new packages
1051=================================== 1265===================================
1052 1266
1053If you are writing a freely available program and want to 1267If you are writing a freely available program and want to
diff --git a/config.rpath b/config.rpath
index c492a93b..b625621f 100755
--- a/config.rpath
+++ b/config.rpath
@@ -2,7 +2,7 @@
2# Output a system dependent set of variables, describing how to set the 2# Output a system dependent set of variables, describing how to set the
3# run time search path of shared libraries in an executable. 3# run time search path of shared libraries in an executable.
4# 4#
5# Copyright 1996-2006 Free Software Foundation, Inc. 5# Copyright 1996-2014 Free Software Foundation, Inc.
6# Taken from GNU libtool, 2001 6# Taken from GNU libtool, 2001
7# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 7# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
8# 8#
@@ -25,7 +25,7 @@
25# known workaround is to choose shorter directory names for the build 25# known workaround is to choose shorter directory names for the build
26# directory and/or the installation directory. 26# directory and/or the installation directory.
27 27
28# All known linkers require a `.a' archive for static linking (except MSVC, 28# All known linkers require a '.a' archive for static linking (except MSVC,
29# which needs '.lib'). 29# which needs '.lib').
30libext=a 30libext=a
31shrext=.so 31shrext=.so
@@ -47,7 +47,7 @@ for cc_temp in $CC""; do
47done 47done
48cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` 48cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
49 49
50# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. 50# Code taken from libtool.m4's _LT_COMPILER_PIC.
51 51
52wl= 52wl=
53if test "$GCC" = yes; then 53if test "$GCC" = yes; then
@@ -57,14 +57,7 @@ else
57 aix*) 57 aix*)
58 wl='-Wl,' 58 wl='-Wl,'
59 ;; 59 ;;
60 darwin*) 60 mingw* | cygwin* | pw32* | os2* | cegcc*)
61 case $cc_basename in
62 xlc*)
63 wl='-Wl,'
64 ;;
65 esac
66 ;;
67 mingw* | pw32* | os2*)
68 ;; 61 ;;
69 hpux9* | hpux10* | hpux11*) 62 hpux9* | hpux10* | hpux11*)
70 wl='-Wl,' 63 wl='-Wl,'
@@ -72,24 +65,37 @@ else
72 irix5* | irix6* | nonstopux*) 65 irix5* | irix6* | nonstopux*)
73 wl='-Wl,' 66 wl='-Wl,'
74 ;; 67 ;;
75 newsos6) 68 linux* | k*bsd*-gnu | kopensolaris*-gnu)
76 ;;
77 linux*)
78 case $cc_basename in 69 case $cc_basename in
79 icc* | ecc*) 70 ecc*)
71 wl='-Wl,'
72 ;;
73 icc* | ifort*)
80 wl='-Wl,' 74 wl='-Wl,'
81 ;; 75 ;;
82 pgcc | pgf77 | pgf90) 76 lf95*)
77 wl='-Wl,'
78 ;;
79 nagfor*)
80 wl='-Wl,-Wl,,'
81 ;;
82 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
83 wl='-Wl,' 83 wl='-Wl,'
84 ;; 84 ;;
85 ccc*) 85 ccc*)
86 wl='-Wl,' 86 wl='-Wl,'
87 ;; 87 ;;
88 xl* | bgxl* | bgf* | mpixl*)
89 wl='-Wl,'
90 ;;
88 como) 91 como)
89 wl='-lopt=' 92 wl='-lopt='
90 ;; 93 ;;
91 *) 94 *)
92 case `$CC -V 2>&1 | sed 5q` in 95 case `$CC -V 2>&1 | sed 5q` in
96 *Sun\ F* | *Sun*Fortran*)
97 wl=
98 ;;
93 *Sun\ C*) 99 *Sun\ C*)
94 wl='-Wl,' 100 wl='-Wl,'
95 ;; 101 ;;
@@ -97,22 +103,36 @@ else
97 ;; 103 ;;
98 esac 104 esac
99 ;; 105 ;;
106 newsos6)
107 ;;
108 *nto* | *qnx*)
109 ;;
100 osf3* | osf4* | osf5*) 110 osf3* | osf4* | osf5*)
101 wl='-Wl,' 111 wl='-Wl,'
102 ;; 112 ;;
103 sco3.2v5*) 113 rdos*)
104 ;; 114 ;;
105 solaris*) 115 solaris*)
106 wl='-Wl,' 116 case $cc_basename in
117 f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
118 wl='-Qoption ld '
119 ;;
120 *)
121 wl='-Wl,'
122 ;;
123 esac
107 ;; 124 ;;
108 sunos4*) 125 sunos4*)
109 wl='-Qoption ld ' 126 wl='-Qoption ld '
110 ;; 127 ;;
111 sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) 128 sysv4 | sysv4.2uw2* | sysv4.3*)
112 wl='-Wl,' 129 wl='-Wl,'
113 ;; 130 ;;
114 sysv4*MP*) 131 sysv4*MP*)
115 ;; 132 ;;
133 sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
134 wl='-Wl,'
135 ;;
116 unicos*) 136 unicos*)
117 wl='-Wl,' 137 wl='-Wl,'
118 ;; 138 ;;
@@ -121,7 +141,7 @@ else
121 esac 141 esac
122fi 142fi
123 143
124# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS. 144# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
125 145
126hardcode_libdir_flag_spec= 146hardcode_libdir_flag_spec=
127hardcode_libdir_separator= 147hardcode_libdir_separator=
@@ -129,7 +149,7 @@ hardcode_direct=no
129hardcode_minus_L=no 149hardcode_minus_L=no
130 150
131case "$host_os" in 151case "$host_os" in
132 cygwin* | mingw* | pw32*) 152 cygwin* | mingw* | pw32* | cegcc*)
133 # FIXME: the MSVC++ port hasn't been tested in a loooong time 153 # FIXME: the MSVC++ port hasn't been tested in a loooong time
134 # When not using gcc, we currently assume that we are using 154 # When not using gcc, we currently assume that we are using
135 # Microsoft Visual C++. 155 # Microsoft Visual C++.
@@ -155,22 +175,21 @@ if test "$with_gnu_ld" = yes; then
155 # option of GNU ld is called -rpath, not --rpath. 175 # option of GNU ld is called -rpath, not --rpath.
156 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 176 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
157 case "$host_os" in 177 case "$host_os" in
158 aix3* | aix4* | aix5*) 178 aix[3-9]*)
159 # On AIX/PPC, the GNU linker is very broken 179 # On AIX/PPC, the GNU linker is very broken
160 if test "$host_cpu" != ia64; then 180 if test "$host_cpu" != ia64; then
161 ld_shlibs=no 181 ld_shlibs=no
162 fi 182 fi
163 ;; 183 ;;
164 amigaos*) 184 amigaos*)
165 hardcode_libdir_flag_spec='-L$libdir' 185 case "$host_cpu" in
166 hardcode_minus_L=yes 186 powerpc)
167 # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports 187 ;;
168 # that the semantics of dynamic libraries on AmigaOS, at least up 188 m68k)
169 # to version 4, is to share data among multiple programs linked 189 hardcode_libdir_flag_spec='-L$libdir'
170 # with the same dynamic library. Since this doesn't match the 190 hardcode_minus_L=yes
171 # behavior of shared libraries on other platforms, we cannot use 191 ;;
172 # them. 192 esac
173 ld_shlibs=no
174 ;; 193 ;;
175 beos*) 194 beos*)
176 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then 195 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -179,7 +198,7 @@ if test "$with_gnu_ld" = yes; then
179 ld_shlibs=no 198 ld_shlibs=no
180 fi 199 fi
181 ;; 200 ;;
182 cygwin* | mingw* | pw32*) 201 cygwin* | mingw* | pw32* | cegcc*)
183 # hardcode_libdir_flag_spec is actually meaningless, as there is 202 # hardcode_libdir_flag_spec is actually meaningless, as there is
184 # no search path for DLLs. 203 # no search path for DLLs.
185 hardcode_libdir_flag_spec='-L$libdir' 204 hardcode_libdir_flag_spec='-L$libdir'
@@ -189,11 +208,13 @@ if test "$with_gnu_ld" = yes; then
189 ld_shlibs=no 208 ld_shlibs=no
190 fi 209 fi
191 ;; 210 ;;
192 interix3*) 211 haiku*)
212 ;;
213 interix[3-9]*)
193 hardcode_direct=no 214 hardcode_direct=no
194 hardcode_libdir_flag_spec='${wl}-rpath,$libdir' 215 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
195 ;; 216 ;;
196 linux*) 217 gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
197 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then 218 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
198 : 219 :
199 else 220 else
@@ -251,7 +272,7 @@ else
251 hardcode_direct=unsupported 272 hardcode_direct=unsupported
252 fi 273 fi
253 ;; 274 ;;
254 aix4* | aix5*) 275 aix[4-9]*)
255 if test "$host_cpu" = ia64; then 276 if test "$host_cpu" = ia64; then
256 # On IA64, the linker does run time linking by default, so we don't 277 # On IA64, the linker does run time linking by default, so we don't
257 # have to do anything special. 278 # have to do anything special.
@@ -261,7 +282,7 @@ else
261 # Test if we are trying to use run time linking or normal 282 # Test if we are trying to use run time linking or normal
262 # AIX style linking. If -brtl is somewhere in LDFLAGS, we 283 # AIX style linking. If -brtl is somewhere in LDFLAGS, we
263 # need to do runtime linking. 284 # need to do runtime linking.
264 case $host_os in aix4.[23]|aix4.[23].*|aix5*) 285 case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
265 for ld_flag in $LDFLAGS; do 286 for ld_flag in $LDFLAGS; do
266 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then 287 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
267 aix_use_runtimelinking=yes 288 aix_use_runtimelinking=yes
@@ -280,7 +301,7 @@ else
280 strings "$collect2name" | grep resolve_lib_name >/dev/null 301 strings "$collect2name" | grep resolve_lib_name >/dev/null
281 then 302 then
282 # We have reworked collect2 303 # We have reworked collect2
283 hardcode_direct=yes 304 :
284 else 305 else
285 # We have old collect2 306 # We have old collect2
286 hardcode_direct=unsupported 307 hardcode_direct=unsupported
@@ -316,14 +337,18 @@ else
316 fi 337 fi
317 ;; 338 ;;
318 amigaos*) 339 amigaos*)
319 hardcode_libdir_flag_spec='-L$libdir' 340 case "$host_cpu" in
320 hardcode_minus_L=yes 341 powerpc)
321 # see comment about different semantics on the GNU ld section 342 ;;
322 ld_shlibs=no 343 m68k)
344 hardcode_libdir_flag_spec='-L$libdir'
345 hardcode_minus_L=yes
346 ;;
347 esac
323 ;; 348 ;;
324 bsdi[45]*) 349 bsdi[45]*)
325 ;; 350 ;;
326 cygwin* | mingw* | pw32*) 351 cygwin* | mingw* | pw32* | cegcc*)
327 # When not using gcc, we currently assume that we are using 352 # When not using gcc, we currently assume that we are using
328 # Microsoft Visual C++. 353 # Microsoft Visual C++.
329 # hardcode_libdir_flag_spec is actually meaningless, as there is 354 # hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -333,33 +358,20 @@ else
333 ;; 358 ;;
334 darwin* | rhapsody*) 359 darwin* | rhapsody*)
335 hardcode_direct=no 360 hardcode_direct=no
336 if test "$GCC" = yes ; then 361 if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
337 : 362 :
338 else 363 else
339 case $cc_basename in 364 ld_shlibs=no
340 xlc*)
341 ;;
342 *)
343 ld_shlibs=no
344 ;;
345 esac
346 fi 365 fi
347 ;; 366 ;;
348 dgux*) 367 dgux*)
349 hardcode_libdir_flag_spec='-L$libdir' 368 hardcode_libdir_flag_spec='-L$libdir'
350 ;; 369 ;;
351 freebsd1*) 370 freebsd2.[01]*)
352 ld_shlibs=no
353 ;;
354 freebsd2.2*)
355 hardcode_libdir_flag_spec='-R$libdir'
356 hardcode_direct=yes
357 ;;
358 freebsd2*)
359 hardcode_direct=yes 371 hardcode_direct=yes
360 hardcode_minus_L=yes 372 hardcode_minus_L=yes
361 ;; 373 ;;
362 freebsd* | kfreebsd*-gnu | dragonfly*) 374 freebsd* | dragonfly*)
363 hardcode_libdir_flag_spec='-R$libdir' 375 hardcode_libdir_flag_spec='-R$libdir'
364 hardcode_direct=yes 376 hardcode_direct=yes
365 ;; 377 ;;
@@ -411,19 +423,25 @@ else
411 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 423 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
412 hardcode_libdir_separator=: 424 hardcode_libdir_separator=:
413 ;; 425 ;;
426 *nto* | *qnx*)
427 ;;
414 openbsd*) 428 openbsd*)
415 hardcode_direct=yes 429 if test -f /usr/libexec/ld.so; then
416 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then 430 hardcode_direct=yes
417 hardcode_libdir_flag_spec='${wl}-rpath,$libdir' 431 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
432 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
433 else
434 case "$host_os" in
435 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
436 hardcode_libdir_flag_spec='-R$libdir'
437 ;;
438 *)
439 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
440 ;;
441 esac
442 fi
418 else 443 else
419 case "$host_os" in 444 ld_shlibs=no
420 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
421 hardcode_libdir_flag_spec='-R$libdir'
422 ;;
423 *)
424 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
425 ;;
426 esac
427 fi 445 fi
428 ;; 446 ;;
429 os2*) 447 os2*)
@@ -471,7 +489,7 @@ else
471 ld_shlibs=yes 489 ld_shlibs=yes
472 fi 490 fi
473 ;; 491 ;;
474 sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) 492 sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
475 ;; 493 ;;
476 sysv5* | sco3.2v5* | sco5v6*) 494 sysv5* | sco3.2v5* | sco5v6*)
477 hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' 495 hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
@@ -487,34 +505,56 @@ else
487fi 505fi
488 506
489# Check dynamic linker characteristics 507# Check dynamic linker characteristics
490# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. 508# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
509# Unlike libtool.m4, here we don't care about _all_ names of the library, but
510# only about the one the linker finds when passed -lNAME. This is the last
511# element of library_names_spec in libtool.m4, or possibly two of them if the
512# linker has special search rules.
513library_names_spec= # the last element of library_names_spec in libtool.m4
491libname_spec='lib$name' 514libname_spec='lib$name'
492case "$host_os" in 515case "$host_os" in
493 aix3*) 516 aix3*)
517 library_names_spec='$libname.a'
494 ;; 518 ;;
495 aix4* | aix5*) 519 aix[4-9]*)
520 library_names_spec='$libname$shrext'
496 ;; 521 ;;
497 amigaos*) 522 amigaos*)
523 case "$host_cpu" in
524 powerpc*)
525 library_names_spec='$libname$shrext' ;;
526 m68k)
527 library_names_spec='$libname.a' ;;
528 esac
498 ;; 529 ;;
499 beos*) 530 beos*)
531 library_names_spec='$libname$shrext'
500 ;; 532 ;;
501 bsdi[45]*) 533 bsdi[45]*)
534 library_names_spec='$libname$shrext'
502 ;; 535 ;;
503 cygwin* | mingw* | pw32*) 536 cygwin* | mingw* | pw32* | cegcc*)
504 shrext=.dll 537 shrext=.dll
538 library_names_spec='$libname.dll.a $libname.lib'
505 ;; 539 ;;
506 darwin* | rhapsody*) 540 darwin* | rhapsody*)
507 shrext=.dylib 541 shrext=.dylib
542 library_names_spec='$libname$shrext'
508 ;; 543 ;;
509 dgux*) 544 dgux*)
545 library_names_spec='$libname$shrext'
510 ;; 546 ;;
511 freebsd1*) 547 freebsd[23].*)
512 ;; 548 library_names_spec='$libname$shrext$versuffix'
513 kfreebsd*-gnu)
514 ;; 549 ;;
515 freebsd* | dragonfly*) 550 freebsd* | dragonfly*)
551 library_names_spec='$libname$shrext'
516 ;; 552 ;;
517 gnu*) 553 gnu*)
554 library_names_spec='$libname$shrext'
555 ;;
556 haiku*)
557 library_names_spec='$libname$shrext'
518 ;; 558 ;;
519 hpux9* | hpux10* | hpux11*) 559 hpux9* | hpux10* | hpux11*)
520 case $host_cpu in 560 case $host_cpu in
@@ -528,10 +568,13 @@ case "$host_os" in
528 shrext=.sl 568 shrext=.sl
529 ;; 569 ;;
530 esac 570 esac
571 library_names_spec='$libname$shrext'
531 ;; 572 ;;
532 interix3*) 573 interix[3-9]*)
574 library_names_spec='$libname$shrext'
533 ;; 575 ;;
534 irix5* | irix6* | nonstopux*) 576 irix5* | irix6* | nonstopux*)
577 library_names_spec='$libname$shrext'
535 case "$host_os" in 578 case "$host_os" in
536 irix5* | nonstopux*) 579 irix5* | nonstopux*)
537 libsuff= shlibsuff= 580 libsuff= shlibsuff=
@@ -548,41 +591,62 @@ case "$host_os" in
548 ;; 591 ;;
549 linux*oldld* | linux*aout* | linux*coff*) 592 linux*oldld* | linux*aout* | linux*coff*)
550 ;; 593 ;;
551 linux*) 594 linux* | k*bsd*-gnu | kopensolaris*-gnu)
595 library_names_spec='$libname$shrext'
552 ;; 596 ;;
553 knetbsd*-gnu) 597 knetbsd*-gnu)
598 library_names_spec='$libname$shrext'
554 ;; 599 ;;
555 netbsd*) 600 netbsd*)
601 library_names_spec='$libname$shrext'
556 ;; 602 ;;
557 newsos6) 603 newsos6)
604 library_names_spec='$libname$shrext'
558 ;; 605 ;;
559 nto-qnx*) 606 *nto* | *qnx*)
607 library_names_spec='$libname$shrext'
560 ;; 608 ;;
561 openbsd*) 609 openbsd*)
610 library_names_spec='$libname$shrext$versuffix'
562 ;; 611 ;;
563 os2*) 612 os2*)
564 libname_spec='$name' 613 libname_spec='$name'
565 shrext=.dll 614 shrext=.dll
615 library_names_spec='$libname.a'
566 ;; 616 ;;
567 osf3* | osf4* | osf5*) 617 osf3* | osf4* | osf5*)
618 library_names_spec='$libname$shrext'
619 ;;
620 rdos*)
568 ;; 621 ;;
569 solaris*) 622 solaris*)
623 library_names_spec='$libname$shrext'
570 ;; 624 ;;
571 sunos4*) 625 sunos4*)
626 library_names_spec='$libname$shrext$versuffix'
572 ;; 627 ;;
573 sysv4 | sysv4.3*) 628 sysv4 | sysv4.3*)
629 library_names_spec='$libname$shrext'
574 ;; 630 ;;
575 sysv4*MP*) 631 sysv4*MP*)
632 library_names_spec='$libname$shrext'
576 ;; 633 ;;
577 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) 634 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
635 library_names_spec='$libname$shrext'
636 ;;
637 tpf*)
638 library_names_spec='$libname$shrext'
578 ;; 639 ;;
579 uts4*) 640 uts4*)
641 library_names_spec='$libname$shrext'
580 ;; 642 ;;
581esac 643esac
582 644
583sed_quote_subst='s/\(["`$\\]\)/\\\1/g' 645sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
584escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` 646escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
585shlibext=`echo "$shrext" | sed -e 's,^\.,,'` 647shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
648escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
649escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
586escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` 650escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
587 651
588LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF 652LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
@@ -596,6 +660,12 @@ libext="$libext"
596# Shared library suffix (normally "so"). 660# Shared library suffix (normally "so").
597shlibext="$shlibext" 661shlibext="$shlibext"
598 662
663# Format of library name prefix.
664libname_spec="$escaped_libname_spec"
665
666# Library names that the linker finds when passed -lNAME.
667library_names_spec="$escaped_library_names_spec"
668
599# Flag to hardcode \$libdir into a binary during linking. 669# Flag to hardcode \$libdir into a binary during linking.
600# This must work even if \$libdir does not exist. 670# This must work even if \$libdir does not exist.
601hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec" 671hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
diff --git a/configure.ac b/configure.ac
index c65f5d3e..e7404a75 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,7 +123,7 @@ GN_LIB_LDFLAGS="-export-dynamic -no-undefined"
123AC_SUBST(GN_LIB_LDFLAGS) 123AC_SUBST(GN_LIB_LDFLAGS)
124 124
125# check for gettext 125# check for gettext
126AM_GNU_GETTEXT_VERSION([0.17]) 126AM_GNU_GETTEXT_VERSION([0.19.3])
127AM_GNU_GETTEXT([external]) 127AM_GNU_GETTEXT([external])
128 128
129AC_CHECK_HEADERS([errno.h stdio.h unistd.h locale.h sys/stat.h sys/types.h langinfo.h libintl.h unistd.h stddef.h argz.h sys/socket.h netinet/in.h stdarg.h]) 129AC_CHECK_HEADERS([errno.h stdio.h unistd.h locale.h sys/stat.h sys/types.h langinfo.h libintl.h unistd.h stddef.h argz.h sys/socket.h netinet/in.h stdarg.h])
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index c9ae1f7d..be247bf7 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -1,5 +1,5 @@
1# gettext.m4 serial 60 (gettext-0.17) 1# gettext.m4 serial 66 (gettext-0.18.2)
2dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. 2dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved. 5dnl with or without modifications, as long as this notice is preserved.
@@ -15,7 +15,7 @@ dnl They are *not* in the public domain.
15 15
16dnl Authors: 16dnl Authors:
17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. 17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006. 18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
19 19
20dnl Macro to add for using GNU gettext. 20dnl Macro to add for using GNU gettext.
21 21
@@ -35,7 +35,7 @@ dnl will be ignored. If NEEDSYMBOL is specified and is
35dnl 'need-formatstring-macros', then GNU gettext implementations that don't 35dnl 'need-formatstring-macros', then GNU gettext implementations that don't
36dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored. 36dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
37dnl INTLDIR is used to find the intl libraries. If empty, 37dnl INTLDIR is used to find the intl libraries. If empty,
38dnl the value `$(top_builddir)/intl/' is used. 38dnl the value '$(top_builddir)/intl/' is used.
39dnl 39dnl
40dnl The result of the configuration is one of three cases: 40dnl The result of the configuration is one of three cases:
41dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled 41dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
@@ -60,6 +60,8 @@ AC_DEFUN([AM_GNU_GETTEXT],
60 ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , 60 ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
61 [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT 61 [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
62])])])])]) 62])])])])])
63 ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
64 [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
63 ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , 65 ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
64 [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT 66 [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
65])])])]) 67])])])])
@@ -95,7 +97,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
95 AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) 97 AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
96 ]) 98 ])
97 99
98 dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation. 100 dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
99 gt_INTL_MACOSX 101 gt_INTL_MACOSX
100 102
101 dnl Set USE_NLS. 103 dnl Set USE_NLS.
@@ -123,11 +125,11 @@ AC_DEFUN([AM_GNU_GETTEXT],
123 gt_use_preinstalled_gnugettext=no 125 gt_use_preinstalled_gnugettext=no
124 ifelse(gt_included_intl, yes, [ 126 ifelse(gt_included_intl, yes, [
125 AC_MSG_CHECKING([whether included gettext is requested]) 127 AC_MSG_CHECKING([whether included gettext is requested])
126 AC_ARG_WITH(included-gettext, 128 AC_ARG_WITH([included-gettext],
127 [ --with-included-gettext use the GNU gettext library included here], 129 [ --with-included-gettext use the GNU gettext library included here],
128 nls_cv_force_use_gnu_gettext=$withval, 130 nls_cv_force_use_gnu_gettext=$withval,
129 nls_cv_force_use_gnu_gettext=no) 131 nls_cv_force_use_gnu_gettext=no)
130 AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) 132 AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
131 133
132 nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" 134 nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
133 if test "$nls_cv_force_use_gnu_gettext" != "yes"; then 135 if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
@@ -155,12 +157,18 @@ changequote([,])dnl
155 fi 157 fi
156 158
157 AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], 159 AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
158 [AC_TRY_LINK([#include <libintl.h> 160 [AC_LINK_IFELSE(
161 [AC_LANG_PROGRAM(
162 [[
163#include <libintl.h>
159$gt_revision_test_code 164$gt_revision_test_code
160extern int _nl_msg_cat_cntr; 165extern int _nl_msg_cat_cntr;
161extern int *_nl_domain_bindings;], 166extern int *_nl_domain_bindings;
162 [bindtextdomain ("", ""); 167 ]],
163return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings], 168 [[
169bindtextdomain ("", "");
170return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
171 ]])],
164 [eval "$gt_func_gnugettext_libc=yes"], 172 [eval "$gt_func_gnugettext_libc=yes"],
165 [eval "$gt_func_gnugettext_libc=no"])]) 173 [eval "$gt_func_gnugettext_libc=no"])])
166 174
@@ -181,35 +189,47 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_b
181 gt_save_LIBS="$LIBS" 189 gt_save_LIBS="$LIBS"
182 LIBS="$LIBS $LIBINTL" 190 LIBS="$LIBS $LIBINTL"
183 dnl Now see whether libintl exists and does not depend on libiconv. 191 dnl Now see whether libintl exists and does not depend on libiconv.
184 AC_TRY_LINK([#include <libintl.h> 192 AC_LINK_IFELSE(
193 [AC_LANG_PROGRAM(
194 [[
195#include <libintl.h>
185$gt_revision_test_code 196$gt_revision_test_code
186extern int _nl_msg_cat_cntr; 197extern int _nl_msg_cat_cntr;
187extern 198extern
188#ifdef __cplusplus 199#ifdef __cplusplus
189"C" 200"C"
190#endif 201#endif
191const char *_nl_expand_alias (const char *);], 202const char *_nl_expand_alias (const char *);
192 [bindtextdomain ("", ""); 203 ]],
193return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], 204 [[
205bindtextdomain ("", "");
206return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
207 ]])],
194 [eval "$gt_func_gnugettext_libintl=yes"], 208 [eval "$gt_func_gnugettext_libintl=yes"],
195 [eval "$gt_func_gnugettext_libintl=no"]) 209 [eval "$gt_func_gnugettext_libintl=no"])
196 dnl Now see whether libintl exists and depends on libiconv. 210 dnl Now see whether libintl exists and depends on libiconv.
197 if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then 211 if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
198 LIBS="$LIBS $LIBICONV" 212 LIBS="$LIBS $LIBICONV"
199 AC_TRY_LINK([#include <libintl.h> 213 AC_LINK_IFELSE(
214 [AC_LANG_PROGRAM(
215 [[
216#include <libintl.h>
200$gt_revision_test_code 217$gt_revision_test_code
201extern int _nl_msg_cat_cntr; 218extern int _nl_msg_cat_cntr;
202extern 219extern
203#ifdef __cplusplus 220#ifdef __cplusplus
204"C" 221"C"
205#endif 222#endif
206const char *_nl_expand_alias (const char *);], 223const char *_nl_expand_alias (const char *);
207 [bindtextdomain ("", ""); 224 ]],
208return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], 225 [[
209 [LIBINTL="$LIBINTL $LIBICONV" 226bindtextdomain ("", "");
210 LTLIBINTL="$LTLIBINTL $LTLIBICONV" 227return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
211 eval "$gt_func_gnugettext_libintl=yes" 228 ]])],
212 ]) 229 [LIBINTL="$LIBINTL $LIBICONV"
230 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
231 eval "$gt_func_gnugettext_libintl=yes"
232 ])
213 fi 233 fi
214 CPPFLAGS="$gt_save_CPPFLAGS" 234 CPPFLAGS="$gt_save_CPPFLAGS"
215 LIBS="$gt_save_LIBS"]) 235 LIBS="$gt_save_LIBS"])
@@ -267,7 +287,7 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a
267 287
268 if test "$gt_use_preinstalled_gnugettext" = "yes" \ 288 if test "$gt_use_preinstalled_gnugettext" = "yes" \
269 || test "$nls_cv_use_gnu_gettext" = "yes"; then 289 || test "$nls_cv_use_gnu_gettext" = "yes"; then
270 AC_DEFINE(ENABLE_NLS, 1, 290 AC_DEFINE([ENABLE_NLS], [1],
271 [Define to 1 if translation of program messages to the user's native language 291 [Define to 1 if translation of program messages to the user's native language
272 is requested.]) 292 is requested.])
273 else 293 else
@@ -301,9 +321,9 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a
301 fi 321 fi
302 322
303 dnl For backward compatibility. Some packages may be using this. 323 dnl For backward compatibility. Some packages may be using this.
304 AC_DEFINE(HAVE_GETTEXT, 1, 324 AC_DEFINE([HAVE_GETTEXT], [1],
305 [Define if the GNU gettext() function is already present or preinstalled.]) 325 [Define if the GNU gettext() function is already present or preinstalled.])
306 AC_DEFINE(HAVE_DCGETTEXT, 1, 326 AC_DEFINE([HAVE_DCGETTEXT], [1],
307 [Define if the GNU dcgettext() function is already present or preinstalled.]) 327 [Define if the GNU dcgettext() function is already present or preinstalled.])
308 fi 328 fi
309 329
@@ -319,9 +339,9 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a
319 fi 339 fi
320 340
321 dnl Make all variables we use known to autoconf. 341 dnl Make all variables we use known to autoconf.
322 AC_SUBST(BUILD_INCLUDED_LIBINTL) 342 AC_SUBST([BUILD_INCLUDED_LIBINTL])
323 AC_SUBST(USE_INCLUDED_LIBINTL) 343 AC_SUBST([USE_INCLUDED_LIBINTL])
324 AC_SUBST(CATOBJEXT) 344 AC_SUBST([CATOBJEXT])
325 345
326 dnl For backward compatibility. Some configure.ins may be using this. 346 dnl For backward compatibility. Some configure.ins may be using this.
327 nls_cv_header_intl= 347 nls_cv_header_intl=
@@ -329,36 +349,36 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a
329 349
330 dnl For backward compatibility. Some Makefiles may be using this. 350 dnl For backward compatibility. Some Makefiles may be using this.
331 DATADIRNAME=share 351 DATADIRNAME=share
332 AC_SUBST(DATADIRNAME) 352 AC_SUBST([DATADIRNAME])
333 353
334 dnl For backward compatibility. Some Makefiles may be using this. 354 dnl For backward compatibility. Some Makefiles may be using this.
335 INSTOBJEXT=.mo 355 INSTOBJEXT=.mo
336 AC_SUBST(INSTOBJEXT) 356 AC_SUBST([INSTOBJEXT])
337 357
338 dnl For backward compatibility. Some Makefiles may be using this. 358 dnl For backward compatibility. Some Makefiles may be using this.
339 GENCAT=gencat 359 GENCAT=gencat
340 AC_SUBST(GENCAT) 360 AC_SUBST([GENCAT])
341 361
342 dnl For backward compatibility. Some Makefiles may be using this. 362 dnl For backward compatibility. Some Makefiles may be using this.
343 INTLOBJS= 363 INTLOBJS=
344 if test "$USE_INCLUDED_LIBINTL" = yes; then 364 if test "$USE_INCLUDED_LIBINTL" = yes; then
345 INTLOBJS="\$(GETTOBJS)" 365 INTLOBJS="\$(GETTOBJS)"
346 fi 366 fi
347 AC_SUBST(INTLOBJS) 367 AC_SUBST([INTLOBJS])
348 368
349 dnl Enable libtool support if the surrounding package wishes it. 369 dnl Enable libtool support if the surrounding package wishes it.
350 INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix 370 INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
351 AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) 371 AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
352 ]) 372 ])
353 373
354 dnl For backward compatibility. Some Makefiles may be using this. 374 dnl For backward compatibility. Some Makefiles may be using this.
355 INTLLIBS="$LIBINTL" 375 INTLLIBS="$LIBINTL"
356 AC_SUBST(INTLLIBS) 376 AC_SUBST([INTLLIBS])
357 377
358 dnl Make all documented variables known to autoconf. 378 dnl Make all documented variables known to autoconf.
359 AC_SUBST(LIBINTL) 379 AC_SUBST([LIBINTL])
360 AC_SUBST(LTLIBINTL) 380 AC_SUBST([LTLIBINTL])
361 AC_SUBST(POSUB) 381 AC_SUBST([POSUB])
362]) 382])
363 383
364 384
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index 66bc76f4..4b29c5f2 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -1,5 +1,5 @@
1# iconv.m4 serial AM6 (gettext-0.17) 1# iconv.m4 serial 18 (gettext-0.18.2)
2dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc. 2dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved. 5dnl with or without modifications, as long as this notice is preserved.
@@ -30,44 +30,55 @@ AC_DEFUN([AM_ICONV_LINK],
30 dnl Add $INCICONV to CPPFLAGS before performing the following checks, 30 dnl Add $INCICONV to CPPFLAGS before performing the following checks,
31 dnl because if the user has installed libiconv and not disabled its use 31 dnl because if the user has installed libiconv and not disabled its use
32 dnl via --without-libiconv-prefix, he wants to use it. The first 32 dnl via --without-libiconv-prefix, he wants to use it. The first
33 dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. 33 dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
34 am_save_CPPFLAGS="$CPPFLAGS" 34 am_save_CPPFLAGS="$CPPFLAGS"
35 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) 35 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
36 36
37 AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [ 37 AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
38 am_cv_func_iconv="no, consider installing GNU libiconv" 38 am_cv_func_iconv="no, consider installing GNU libiconv"
39 am_cv_lib_iconv=no 39 am_cv_lib_iconv=no
40 AC_TRY_LINK([#include <stdlib.h> 40 AC_LINK_IFELSE(
41#include <iconv.h>], 41 [AC_LANG_PROGRAM(
42 [iconv_t cd = iconv_open("",""); 42 [[
43 iconv(cd,NULL,NULL,NULL,NULL); 43#include <stdlib.h>
44 iconv_close(cd);], 44#include <iconv.h>
45 am_cv_func_iconv=yes) 45 ]],
46 [[iconv_t cd = iconv_open("","");
47 iconv(cd,NULL,NULL,NULL,NULL);
48 iconv_close(cd);]])],
49 [am_cv_func_iconv=yes])
46 if test "$am_cv_func_iconv" != yes; then 50 if test "$am_cv_func_iconv" != yes; then
47 am_save_LIBS="$LIBS" 51 am_save_LIBS="$LIBS"
48 LIBS="$LIBS $LIBICONV" 52 LIBS="$LIBS $LIBICONV"
49 AC_TRY_LINK([#include <stdlib.h> 53 AC_LINK_IFELSE(
50#include <iconv.h>], 54 [AC_LANG_PROGRAM(
51 [iconv_t cd = iconv_open("",""); 55 [[
52 iconv(cd,NULL,NULL,NULL,NULL); 56#include <stdlib.h>
53 iconv_close(cd);], 57#include <iconv.h>
54 am_cv_lib_iconv=yes 58 ]],
55 am_cv_func_iconv=yes) 59 [[iconv_t cd = iconv_open("","");
60 iconv(cd,NULL,NULL,NULL,NULL);
61 iconv_close(cd);]])],
62 [am_cv_lib_iconv=yes]
63 [am_cv_func_iconv=yes])
56 LIBS="$am_save_LIBS" 64 LIBS="$am_save_LIBS"
57 fi 65 fi
58 ]) 66 ])
59 if test "$am_cv_func_iconv" = yes; then 67 if test "$am_cv_func_iconv" = yes; then
60 AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [ 68 AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
61 dnl This tests against bugs in AIX 5.1 and HP-UX 11.11. 69 dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
70 dnl Solaris 10.
62 am_save_LIBS="$LIBS" 71 am_save_LIBS="$LIBS"
63 if test $am_cv_lib_iconv = yes; then 72 if test $am_cv_lib_iconv = yes; then
64 LIBS="$LIBS $LIBICONV" 73 LIBS="$LIBS $LIBICONV"
65 fi 74 fi
66 AC_TRY_RUN([ 75 AC_RUN_IFELSE(
76 [AC_LANG_SOURCE([[
67#include <iconv.h> 77#include <iconv.h>
68#include <string.h> 78#include <string.h>
69int main () 79int main ()
70{ 80{
81 int result = 0;
71 /* Test against AIX 5.1 bug: Failures are not distinguishable from successful 82 /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
72 returns. */ 83 returns. */
73 { 84 {
@@ -84,7 +95,47 @@ int main ()
84 (char **) &inptr, &inbytesleft, 95 (char **) &inptr, &inbytesleft,
85 &outptr, &outbytesleft); 96 &outptr, &outbytesleft);
86 if (res == 0) 97 if (res == 0)
87 return 1; 98 result |= 1;
99 iconv_close (cd_utf8_to_88591);
100 }
101 }
102 /* Test against Solaris 10 bug: Failures are not distinguishable from
103 successful returns. */
104 {
105 iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
106 if (cd_ascii_to_88591 != (iconv_t)(-1))
107 {
108 static const char input[] = "\263";
109 char buf[10];
110 const char *inptr = input;
111 size_t inbytesleft = strlen (input);
112 char *outptr = buf;
113 size_t outbytesleft = sizeof (buf);
114 size_t res = iconv (cd_ascii_to_88591,
115 (char **) &inptr, &inbytesleft,
116 &outptr, &outbytesleft);
117 if (res == 0)
118 result |= 2;
119 iconv_close (cd_ascii_to_88591);
120 }
121 }
122 /* Test against AIX 6.1..7.1 bug: Buffer overrun. */
123 {
124 iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
125 if (cd_88591_to_utf8 != (iconv_t)(-1))
126 {
127 static const char input[] = "\304";
128 static char buf[2] = { (char)0xDE, (char)0xAD };
129 const char *inptr = input;
130 size_t inbytesleft = 1;
131 char *outptr = buf;
132 size_t outbytesleft = 1;
133 size_t res = iconv (cd_88591_to_utf8,
134 (char **) &inptr, &inbytesleft,
135 &outptr, &outbytesleft);
136 if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
137 result |= 4;
138 iconv_close (cd_88591_to_utf8);
88 } 139 }
89 } 140 }
90#if 0 /* This bug could be worked around by the caller. */ 141#if 0 /* This bug could be worked around by the caller. */
@@ -103,7 +154,8 @@ int main ()
103 (char **) &inptr, &inbytesleft, 154 (char **) &inptr, &inbytesleft,
104 &outptr, &outbytesleft); 155 &outptr, &outbytesleft);
105 if ((int)res > 0) 156 if ((int)res > 0)
106 return 1; 157 result |= 8;
158 iconv_close (cd_88591_to_utf8);
107 } 159 }
108 } 160 }
109#endif 161#endif
@@ -117,13 +169,19 @@ int main ()
117 && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) 169 && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
118 /* Try HP-UX names. */ 170 /* Try HP-UX names. */
119 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) 171 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
120 return 1; 172 result |= 16;
121 return 0; 173 return result;
122}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], 174}]])],
123 [case "$host_os" in 175 [am_cv_func_iconv_works=yes],
176 [am_cv_func_iconv_works=no],
177 [
178changequote(,)dnl
179 case "$host_os" in
124 aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; 180 aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
125 *) am_cv_func_iconv_works="guessing yes" ;; 181 *) am_cv_func_iconv_works="guessing yes" ;;
126 esac]) 182 esac
183changequote([,])dnl
184 ])
127 LIBS="$am_save_LIBS" 185 LIBS="$am_save_LIBS"
128 ]) 186 ])
129 case "$am_cv_func_iconv_works" in 187 case "$am_cv_func_iconv_works" in
@@ -134,7 +192,7 @@ int main ()
134 am_func_iconv=no am_cv_lib_iconv=no 192 am_func_iconv=no am_cv_lib_iconv=no
135 fi 193 fi
136 if test "$am_func_iconv" = yes; then 194 if test "$am_func_iconv" = yes; then
137 AC_DEFINE(HAVE_ICONV, 1, 195 AC_DEFINE([HAVE_ICONV], [1],
138 [Define if you have the iconv() function and it works.]) 196 [Define if you have the iconv() function and it works.])
139 fi 197 fi
140 if test "$am_cv_lib_iconv" = yes; then 198 if test "$am_cv_lib_iconv" = yes; then
@@ -147,34 +205,64 @@ int main ()
147 LIBICONV= 205 LIBICONV=
148 LTLIBICONV= 206 LTLIBICONV=
149 fi 207 fi
150 AC_SUBST(LIBICONV) 208 AC_SUBST([LIBICONV])
151 AC_SUBST(LTLIBICONV) 209 AC_SUBST([LTLIBICONV])
152]) 210])
153 211
154AC_DEFUN([AM_ICONV], 212dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
213dnl avoid warnings like
214dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
215dnl This is tricky because of the way 'aclocal' is implemented:
216dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
217dnl Otherwise aclocal's initial scan pass would miss the macro definition.
218dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
219dnl Otherwise aclocal would emit many "Use of uninitialized value $1"
220dnl warnings.
221m4_define([gl_iconv_AC_DEFUN],
222 m4_version_prereq([2.64],
223 [[AC_DEFUN_ONCE(
224 [$1], [$2])]],
225 [m4_ifdef([gl_00GNULIB],
226 [[AC_DEFUN_ONCE(
227 [$1], [$2])]],
228 [[AC_DEFUN(
229 [$1], [$2])]])]))
230gl_iconv_AC_DEFUN([AM_ICONV],
155[ 231[
156 AM_ICONV_LINK 232 AM_ICONV_LINK
157 if test "$am_cv_func_iconv" = yes; then 233 if test "$am_cv_func_iconv" = yes; then
158 AC_MSG_CHECKING([for iconv declaration]) 234 AC_MSG_CHECKING([for iconv declaration])
159 AC_CACHE_VAL(am_cv_proto_iconv, [ 235 AC_CACHE_VAL([am_cv_proto_iconv], [
160 AC_TRY_COMPILE([ 236 AC_COMPILE_IFELSE(
237 [AC_LANG_PROGRAM(
238 [[
161#include <stdlib.h> 239#include <stdlib.h>
162#include <iconv.h> 240#include <iconv.h>
163extern 241extern
164#ifdef __cplusplus 242#ifdef __cplusplus
165"C" 243"C"
166#endif 244#endif
167#if defined(__STDC__) || defined(__cplusplus) 245#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
168size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); 246size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
169#else 247#else
170size_t iconv(); 248size_t iconv();
171#endif 249#endif
172], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") 250 ]],
251 [[]])],
252 [am_cv_proto_iconv_arg1=""],
253 [am_cv_proto_iconv_arg1="const"])
173 am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) 254 am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
174 am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` 255 am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
175 AC_MSG_RESULT([$]{ac_t:- 256 AC_MSG_RESULT([
176 }[$]am_cv_proto_iconv) 257 $am_cv_proto_iconv])
177 AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, 258 AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
178 [Define as const if the declaration of iconv() needs const.]) 259 [Define as const if the declaration of iconv() needs const.])
260 dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
261 m4_ifdef([gl_ICONV_H_DEFAULTS],
262 [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
263 if test -n "$am_cv_proto_iconv_arg1"; then
264 ICONV_CONST="const"
265 fi
266 ])
179 fi 267 fi
180]) 268])
diff --git a/m4/intl.m4 b/m4/intl.m4
index bc79f38d..1747af90 100644
--- a/m4/intl.m4
+++ b/m4/intl.m4
@@ -1,5 +1,5 @@
1# intl.m4 serial 3 (gettext-0.16) 1# intl.m4 serial 27 (gettext-0.19)
2dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. 2dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved. 5dnl with or without modifications, as long as this notice is preserved.
@@ -15,9 +15,9 @@ dnl They are *not* in the public domain.
15 15
16dnl Authors: 16dnl Authors:
17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. 17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006. 18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2009.
19 19
20AC_PREREQ(2.52) 20AC_PREREQ([2.60])
21 21
22dnl Checks for all prerequisites of the intl subdirectory, 22dnl Checks for all prerequisites of the intl subdirectory,
23dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, 23dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
@@ -25,38 +25,51 @@ dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
25AC_DEFUN([AM_INTL_SUBDIR], 25AC_DEFUN([AM_INTL_SUBDIR],
26[ 26[
27 AC_REQUIRE([AC_PROG_INSTALL])dnl 27 AC_REQUIRE([AC_PROG_INSTALL])dnl
28 AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake 28 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
29 AC_REQUIRE([AC_PROG_CC])dnl 29 AC_REQUIRE([AC_PROG_CC])dnl
30 AC_REQUIRE([AC_CANONICAL_HOST])dnl 30 AC_REQUIRE([AC_CANONICAL_HOST])dnl
31 AC_REQUIRE([gt_GLIBC2])dnl
31 AC_REQUIRE([AC_PROG_RANLIB])dnl 32 AC_REQUIRE([AC_PROG_RANLIB])dnl
32 AC_REQUIRE([gl_VISIBILITY])dnl 33 AC_REQUIRE([gl_VISIBILITY])dnl
33 AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl 34 AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl
34 AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl 35 AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl
35 AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
36 AC_REQUIRE([gt_TYPE_WCHAR_T])dnl 36 AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
37 AC_REQUIRE([gt_TYPE_WINT_T])dnl 37 AC_REQUIRE([gt_TYPE_WINT_T])dnl
38 AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
38 AC_REQUIRE([gt_TYPE_INTMAX_T]) 39 AC_REQUIRE([gt_TYPE_INTMAX_T])
39 AC_REQUIRE([gt_PRINTF_POSIX]) 40 AC_REQUIRE([gt_PRINTF_POSIX])
41 AC_REQUIRE([gl_GLIBC21])dnl
40 AC_REQUIRE([gl_XSIZE])dnl 42 AC_REQUIRE([gl_XSIZE])dnl
43 AC_REQUIRE([gl_FCNTL_O_FLAGS])dnl
44 AC_REQUIRE([gt_INTL_MACOSX])dnl
45 AC_REQUIRE([gl_EXTERN_INLINE])dnl
46 AC_REQUIRE([gt_GL_ATTRIBUTE])dnl
47
48 dnl Support for automake's --enable-silent-rules.
49 case "$enable_silent_rules" in
50 yes) INTL_DEFAULT_VERBOSITY=0;;
51 no) INTL_DEFAULT_VERBOSITY=1;;
52 *) INTL_DEFAULT_VERBOSITY=1;;
53 esac
54 AC_SUBST([INTL_DEFAULT_VERBOSITY])
41 55
42 AC_CHECK_TYPE([ptrdiff_t], , 56 AC_CHECK_TYPE([ptrdiff_t], ,
43 [AC_DEFINE([ptrdiff_t], [long], 57 [AC_DEFINE([ptrdiff_t], [long],
44 [Define as the type of the result of subtracting two pointers, if the system doesn't define it.]) 58 [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
45 ]) 59 ])
46 AC_CHECK_HEADERS([stddef.h stdlib.h string.h]) 60 AC_CHECK_HEADERS([features.h stddef.h stdlib.h string.h])
47 AC_CHECK_FUNCS([asprintf fwprintf putenv setenv setlocale snprintf wcslen]) 61 AC_CHECK_FUNCS([asprintf fwprintf newlocale putenv setenv setlocale \
62 snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb])
48 63
49 dnl Use the _snprintf function only if it is declared (because on NetBSD it 64 dnl Use the _snprintf function only if it is declared (because on NetBSD it
50 dnl is defined as a weak alias of snprintf; we prefer to use the latter). 65 dnl is defined as a weak alias of snprintf; we prefer to use the latter).
51 gt_CHECK_DECL(_snprintf, [#include <stdio.h>]) 66 AC_CHECK_DECLS([_snprintf, _snwprintf], , , [#include <stdio.h>])
52 gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
53 67
54 dnl Use the *_unlocked functions only if they are declared. 68 dnl Use the *_unlocked functions only if they are declared.
55 dnl (because some of them were defined without being declared in Solaris 69 dnl (because some of them were defined without being declared in Solaris
56 dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built 70 dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
57 dnl on Solaris 2.5.1 to run on Solaris 2.6). 71 dnl on Solaris 2.5.1 to run on Solaris 2.6).
58 dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. 72 AC_CHECK_DECLS([getc_unlocked], , , [#include <stdio.h>])
59 gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
60 73
61 case $gt_cv_func_printf_posix in 74 case $gt_cv_func_printf_posix in
62 *yes) HAVE_POSIX_PRINTF=1 ;; 75 *yes) HAVE_POSIX_PRINTF=1 ;;
@@ -75,6 +88,12 @@ AC_DEFUN([AM_INTL_SUBDIR],
75 HAVE_SNPRINTF=0 88 HAVE_SNPRINTF=0
76 fi 89 fi
77 AC_SUBST([HAVE_SNPRINTF]) 90 AC_SUBST([HAVE_SNPRINTF])
91 if test "$ac_cv_func_newlocale" = yes; then
92 HAVE_NEWLOCALE=1
93 else
94 HAVE_NEWLOCALE=0
95 fi
96 AC_SUBST([HAVE_NEWLOCALE])
78 if test "$ac_cv_func_wprintf" = yes; then 97 if test "$ac_cv_func_wprintf" = yes; then
79 HAVE_WPRINTF=1 98 HAVE_WPRINTF=1
80 else 99 else
@@ -94,7 +113,7 @@ AC_DEFUN([AM_INTL_SUBDIR],
94 dnl exported variables _also_ in the static library. 113 dnl exported variables _also_ in the static library.
95 if test "$enable_shared" = yes; then 114 if test "$enable_shared" = yes; then
96 case "$host_os" in 115 case "$host_os" in
97 cygwin*) is_woe32dll=yes ;; 116 mingw* | cygwin*) is_woe32dll=yes ;;
98 *) is_woe32dll=no ;; 117 *) is_woe32dll=no ;;
99 esac 118 esac
100 else 119 else
@@ -103,6 +122,31 @@ AC_DEFUN([AM_INTL_SUBDIR],
103 WOE32DLL=$is_woe32dll 122 WOE32DLL=$is_woe32dll
104 AC_SUBST([WOE32DLL]) 123 AC_SUBST([WOE32DLL])
105 124
125 dnl On mingw and Cygwin, we can activate special Makefile rules which add
126 dnl version information to the shared libraries and executables.
127 case "$host_os" in
128 mingw* | cygwin*) is_woe32=yes ;;
129 *) is_woe32=no ;;
130 esac
131 WOE32=$is_woe32
132 AC_SUBST([WOE32])
133 if test $WOE32 = yes; then
134 dnl Check for a program that compiles Windows resource files.
135 AC_CHECK_TOOL([WINDRES], [windres])
136 fi
137
138 dnl Determine whether when creating a library, "-lc" should be passed to
139 dnl libtool or not. On many platforms, it is required for the libtool option
140 dnl -no-undefined to work. On HP-UX, however, the -lc - stored by libtool
141 dnl in the *.la files - makes it impossible to create multithreaded programs,
142 dnl because libtool also reorders the -lc to come before the -pthread, and
143 dnl this disables pthread_create() <http://docs.hp.com/en/1896/pthreads.html>.
144 case "$host_os" in
145 hpux*) LTLIBC="" ;;
146 *) LTLIBC="-lc" ;;
147 esac
148 AC_SUBST([LTLIBC])
149
106 dnl Rename some macros and functions used for locking. 150 dnl Rename some macros and functions used for locking.
107 AH_BOTTOM([ 151 AH_BOTTOM([
108#define __libc_lock_t gl_lock_t 152#define __libc_lock_t gl_lock_t
@@ -118,22 +162,31 @@ AC_DEFUN([AM_INTL_SUBDIR],
118#define __libc_lock_lock_recursive gl_recursive_lock_lock 162#define __libc_lock_lock_recursive gl_recursive_lock_lock
119#define __libc_lock_unlock_recursive gl_recursive_lock_unlock 163#define __libc_lock_unlock_recursive gl_recursive_lock_unlock
120#define glthread_in_use libintl_thread_in_use 164#define glthread_in_use libintl_thread_in_use
121#define glthread_lock_init libintl_lock_init 165#define glthread_lock_init_func libintl_lock_init_func
122#define glthread_lock_lock libintl_lock_lock 166#define glthread_lock_lock_func libintl_lock_lock_func
123#define glthread_lock_unlock libintl_lock_unlock 167#define glthread_lock_unlock_func libintl_lock_unlock_func
124#define glthread_lock_destroy libintl_lock_destroy 168#define glthread_lock_destroy_func libintl_lock_destroy_func
125#define glthread_rwlock_init libintl_rwlock_init 169#define glthread_rwlock_init_multithreaded libintl_rwlock_init_multithreaded
126#define glthread_rwlock_rdlock libintl_rwlock_rdlock 170#define glthread_rwlock_init_func libintl_rwlock_init_func
127#define glthread_rwlock_wrlock libintl_rwlock_wrlock 171#define glthread_rwlock_rdlock_multithreaded libintl_rwlock_rdlock_multithreaded
128#define glthread_rwlock_unlock libintl_rwlock_unlock 172#define glthread_rwlock_rdlock_func libintl_rwlock_rdlock_func
129#define glthread_rwlock_destroy libintl_rwlock_destroy 173#define glthread_rwlock_wrlock_multithreaded libintl_rwlock_wrlock_multithreaded
130#define glthread_recursive_lock_init libintl_recursive_lock_init 174#define glthread_rwlock_wrlock_func libintl_rwlock_wrlock_func
131#define glthread_recursive_lock_lock libintl_recursive_lock_lock 175#define glthread_rwlock_unlock_multithreaded libintl_rwlock_unlock_multithreaded
132#define glthread_recursive_lock_unlock libintl_recursive_lock_unlock 176#define glthread_rwlock_unlock_func libintl_rwlock_unlock_func
133#define glthread_recursive_lock_destroy libintl_recursive_lock_destroy 177#define glthread_rwlock_destroy_multithreaded libintl_rwlock_destroy_multithreaded
134#define glthread_once libintl_once 178#define glthread_rwlock_destroy_func libintl_rwlock_destroy_func
135#define glthread_once_call libintl_once_call 179#define glthread_recursive_lock_init_multithreaded libintl_recursive_lock_init_multithreaded
180#define glthread_recursive_lock_init_func libintl_recursive_lock_init_func
181#define glthread_recursive_lock_lock_multithreaded libintl_recursive_lock_lock_multithreaded
182#define glthread_recursive_lock_lock_func libintl_recursive_lock_lock_func
183#define glthread_recursive_lock_unlock_multithreaded libintl_recursive_lock_unlock_multithreaded
184#define glthread_recursive_lock_unlock_func libintl_recursive_lock_unlock_func
185#define glthread_recursive_lock_destroy_multithreaded libintl_recursive_lock_destroy_multithreaded
186#define glthread_recursive_lock_destroy_func libintl_recursive_lock_destroy_func
187#define glthread_once_func libintl_once_func
136#define glthread_once_singlethreaded libintl_once_singlethreaded 188#define glthread_once_singlethreaded libintl_once_singlethreaded
189#define glthread_once_multithreaded libintl_once_multithreaded
137]) 190])
138]) 191])
139 192
@@ -159,51 +212,37 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE],
159[ 212[
160 AC_REQUIRE([AC_C_INLINE])dnl 213 AC_REQUIRE([AC_C_INLINE])dnl
161 AC_REQUIRE([AC_TYPE_SIZE_T])dnl 214 AC_REQUIRE([AC_TYPE_SIZE_T])dnl
215 AC_REQUIRE([gl_AC_HEADER_STDINT_H])
162 AC_REQUIRE([AC_FUNC_ALLOCA])dnl 216 AC_REQUIRE([AC_FUNC_ALLOCA])dnl
163 AC_REQUIRE([AC_FUNC_MMAP])dnl 217 AC_REQUIRE([AC_FUNC_MMAP])dnl
164 AC_REQUIRE([gt_INTDIV0])dnl 218 AC_REQUIRE([gt_INTDIV0])dnl
219 AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
165 AC_REQUIRE([gt_INTTYPES_PRI])dnl 220 AC_REQUIRE([gt_INTTYPES_PRI])dnl
166 AC_REQUIRE([gl_LOCK])dnl 221 AC_REQUIRE([gl_LOCK])dnl
167 222
168 AC_TRY_LINK( 223 AC_LINK_IFELSE(
169 [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }], 224 [AC_LANG_PROGRAM(
170 [], 225 [[int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }]],
171 [AC_DEFINE([HAVE_BUILTIN_EXPECT], 1, 226 [[]])],
227 [AC_DEFINE([HAVE_BUILTIN_EXPECT], [1],
172 [Define to 1 if the compiler understands __builtin_expect.])]) 228 [Define to 1 if the compiler understands __builtin_expect.])])
173 229
174 AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h]) 230 AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h])
175 AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \ 231 AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \
176 stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \ 232 stpcpy strcasecmp strdup strtoul tsearch uselocale argz_count \
177 argz_next __fsetlocking]) 233 argz_stringify argz_next __fsetlocking])
178 234
179 dnl Use the *_unlocked functions only if they are declared. 235 dnl Use the *_unlocked functions only if they are declared.
180 dnl (because some of them were defined without being declared in Solaris 236 dnl (because some of them were defined without being declared in Solaris
181 dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built 237 dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
182 dnl on Solaris 2.5.1 to run on Solaris 2.6). 238 dnl on Solaris 2.5.1 to run on Solaris 2.6).
183 dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. 239 AC_CHECK_DECLS([feof_unlocked, fgets_unlocked], , , [#include <stdio.h>])
184 gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
185 gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
186 240
187 AM_ICONV 241 AM_ICONV
188 242
189 dnl glibc >= 2.4 has a NL_LOCALE_NAME macro when _GNU_SOURCE is defined,
190 dnl and a _NL_LOCALE_NAME macro always.
191 AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name,
192 [AC_TRY_LINK([#include <langinfo.h>
193#include <locale.h>],
194 [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));],
195 gt_cv_nl_locale_name=yes,
196 gt_cv_nl_locale_name=no)
197 ])
198 if test $gt_cv_nl_locale_name = yes; then
199 AC_DEFINE(HAVE_NL_LOCALE_NAME, 1,
200 [Define if you have <langinfo.h> and it defines the NL_LOCALE_NAME macro if _GNU_SOURCE is defined.])
201 fi
202
203 dnl intl/plural.c is generated from intl/plural.y. It requires bison, 243 dnl intl/plural.c is generated from intl/plural.y. It requires bison,
204 dnl because plural.y uses bison specific features. It requires at least 244 dnl because plural.y uses bison specific features. It requires at least
205 dnl bison-1.26 because earlier versions generate a plural.c that doesn't 245 dnl bison-2.7 for %define api.pure.
206 dnl compile.
207 dnl bison is only needed for the maintainer (who touches plural.y). But in 246 dnl bison is only needed for the maintainer (who touches plural.y). But in
208 dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put 247 dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
209 dnl the rule in general Makefile. Now, some people carelessly touch the 248 dnl the rule in general Makefile. Now, some people carelessly touch the
@@ -220,7 +259,7 @@ changequote(<<,>>)dnl
220 ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` 259 ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
221 case $ac_prog_version in 260 case $ac_prog_version in
222 '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; 261 '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
223 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) 262 2.[7-9]* | [3-9].*)
224changequote([,])dnl 263changequote([,])dnl
225 ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; 264 ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
226 *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; 265 *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
@@ -232,22 +271,28 @@ changequote([,])dnl
232 fi 271 fi
233]) 272])
234 273
274dnl Copies _GL_UNUSED and _GL_ATTRIBUTE_PURE definitions from
275dnl gnulib-common.m4 as a fallback, if the project isn't using Gnulib.
276AC_DEFUN([gt_GL_ATTRIBUTE], [
277 m4_ifndef([gl_[]COMMON],
278 AH_VERBATIM([gt_gl_attribute],
279[/* Define as a marker that can be attached to declarations that might not
280 be used. This helps to reduce warnings, such as from
281 GCC -Wunused-parameter. */
282#ifndef _GL_UNUSED
283# if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
284# define _GL_UNUSED __attribute__ ((__unused__))
285# else
286# define _GL_UNUSED
287# endif
288#endif
235 289
236dnl gt_CHECK_DECL(FUNC, INCLUDES) 290/* The __pure__ attribute was added in gcc 2.96. */
237dnl Check whether a function is declared. 291#ifndef _GL_ATTRIBUTE_PURE
238AC_DEFUN([gt_CHECK_DECL], 292# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
239[ 293# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
240 AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1, 294# else
241 [AC_TRY_COMPILE([$2], [ 295# define _GL_ATTRIBUTE_PURE /* empty */
242#ifndef $1 296# endif
243 char *p = (char *) $1;
244#endif 297#endif
245], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)]) 298]))])
246 if test $ac_cv_have_decl_$1 = yes; then
247 gt_value=1
248 else
249 gt_value=0
250 fi
251 AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
252 [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
253])
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
index 96c4e2c3..ddc569f7 100644
--- a/m4/lib-ld.m4
+++ b/m4/lib-ld.m4
@@ -1,50 +1,56 @@
1# lib-ld.m4 serial 3 (gettext-0.13) 1# lib-ld.m4 serial 6
2dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved. 5dnl with or without modifications, as long as this notice is preserved.
6 6
7dnl Subroutines of libtool.m4, 7dnl Subroutines of libtool.m4,
8dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision 8dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
9dnl with libtool.m4. 9dnl collision with libtool.m4.
10 10
11dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. 11dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
12AC_DEFUN([AC_LIB_PROG_LD_GNU], 12AC_DEFUN([AC_LIB_PROG_LD_GNU],
13[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, 13[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
14[# I'd rather use --version here, but apparently some GNU ld's only accept -v. 14[# I'd rather use --version here, but apparently some GNU lds only accept -v.
15case `$LD -v 2>&1 </dev/null` in 15case `$LD -v 2>&1 </dev/null` in
16*GNU* | *'with BFD'*) 16*GNU* | *'with BFD'*)
17 acl_cv_prog_gnu_ld=yes ;; 17 acl_cv_prog_gnu_ld=yes
18 ;;
18*) 19*)
19 acl_cv_prog_gnu_ld=no ;; 20 acl_cv_prog_gnu_ld=no
21 ;;
20esac]) 22esac])
21with_gnu_ld=$acl_cv_prog_gnu_ld 23with_gnu_ld=$acl_cv_prog_gnu_ld
22]) 24])
23 25
24dnl From libtool-1.4. Sets the variable LD. 26dnl From libtool-2.4. Sets the variable LD.
25AC_DEFUN([AC_LIB_PROG_LD], 27AC_DEFUN([AC_LIB_PROG_LD],
26[AC_ARG_WITH(gnu-ld, 28[AC_REQUIRE([AC_PROG_CC])dnl
27[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
28test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
29AC_REQUIRE([AC_PROG_CC])dnl
30AC_REQUIRE([AC_CANONICAL_HOST])dnl 29AC_REQUIRE([AC_CANONICAL_HOST])dnl
30
31AC_ARG_WITH([gnu-ld],
32 [AS_HELP_STRING([--with-gnu-ld],
33 [assume the C compiler uses GNU ld [default=no]])],
34 [test "$withval" = no || with_gnu_ld=yes],
35 [with_gnu_ld=no])dnl
36
31# Prepare PATH_SEPARATOR. 37# Prepare PATH_SEPARATOR.
32# The user is always right. 38# The user is always right.
33if test "${PATH_SEPARATOR+set}" != set; then 39if test "${PATH_SEPARATOR+set}" != set; then
34 echo "#! /bin/sh" >conf$$.sh 40 # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
35 echo "exit 0" >>conf$$.sh 41 # contains only /bin. Note that ksh looks also at the FPATH variable,
36 chmod +x conf$$.sh 42 # so we have to set that as well for the test.
37 if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then 43 PATH_SEPARATOR=:
38 PATH_SEPARATOR=';' 44 (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
39 else 45 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
40 PATH_SEPARATOR=: 46 || PATH_SEPARATOR=';'
41 fi 47 }
42 rm -f conf$$.sh
43fi 48fi
49
44ac_prog=ld 50ac_prog=ld
45if test "$GCC" = yes; then 51if test "$GCC" = yes; then
46 # Check if gcc -print-prog-name=ld gives a path. 52 # Check if gcc -print-prog-name=ld gives a path.
47 AC_MSG_CHECKING([for ld used by GCC]) 53 AC_MSG_CHECKING([for ld used by $CC])
48 case $host in 54 case $host in
49 *-*-mingw*) 55 *-*-mingw*)
50 # gcc leaves a trailing carriage return which upsets mingw 56 # gcc leaves a trailing carriage return which upsets mingw
@@ -54,12 +60,12 @@ if test "$GCC" = yes; then
54 esac 60 esac
55 case $ac_prog in 61 case $ac_prog in
56 # Accept absolute paths. 62 # Accept absolute paths.
57 [[\\/]* | [A-Za-z]:[\\/]*)] 63 [[\\/]]* | ?:[[\\/]]*)
58 [re_direlt='/[^/][^/]*/\.\./'] 64 re_direlt='/[[^/]][[^/]]*/\.\./'
59 # Canonicalize the path of ld 65 # Canonicalize the pathname of ld
60 ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` 66 ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
61 while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do 67 while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
62 ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` 68 ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
63 done 69 done
64 test -z "$LD" && LD="$ac_prog" 70 test -z "$LD" && LD="$ac_prog"
65 ;; 71 ;;
@@ -77,33 +83,36 @@ elif test "$with_gnu_ld" = yes; then
77else 83else
78 AC_MSG_CHECKING([for non-GNU ld]) 84 AC_MSG_CHECKING([for non-GNU ld])
79fi 85fi
80AC_CACHE_VAL(acl_cv_path_LD, 86AC_CACHE_VAL([acl_cv_path_LD],
81[if test -z "$LD"; then 87[if test -z "$LD"; then
82 IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" 88 acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
83 for ac_dir in $PATH; do 89 for ac_dir in $PATH; do
90 IFS="$acl_save_ifs"
84 test -z "$ac_dir" && ac_dir=. 91 test -z "$ac_dir" && ac_dir=.
85 if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then 92 if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
86 acl_cv_path_LD="$ac_dir/$ac_prog" 93 acl_cv_path_LD="$ac_dir/$ac_prog"
87 # Check to see if the program is GNU ld. I'd rather use --version, 94 # Check to see if the program is GNU ld. I'd rather use --version,
88 # but apparently some GNU ld's only accept -v. 95 # but apparently some variants of GNU ld only accept -v.
89 # Break only if it was the GNU/non-GNU ld that we prefer. 96 # Break only if it was the GNU/non-GNU ld that we prefer.
90 case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in 97 case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
91 *GNU* | *'with BFD'*) 98 *GNU* | *'with BFD'*)
92 test "$with_gnu_ld" != no && break ;; 99 test "$with_gnu_ld" != no && break
100 ;;
93 *) 101 *)
94 test "$with_gnu_ld" != yes && break ;; 102 test "$with_gnu_ld" != yes && break
103 ;;
95 esac 104 esac
96 fi 105 fi
97 done 106 done
98 IFS="$ac_save_ifs" 107 IFS="$acl_save_ifs"
99else 108else
100 acl_cv_path_LD="$LD" # Let the user override the test with a path. 109 acl_cv_path_LD="$LD" # Let the user override the test with a path.
101fi]) 110fi])
102LD="$acl_cv_path_LD" 111LD="$acl_cv_path_LD"
103if test -n "$LD"; then 112if test -n "$LD"; then
104 AC_MSG_RESULT($LD) 113 AC_MSG_RESULT([$LD])
105else 114else
106 AC_MSG_RESULT(no) 115 AC_MSG_RESULT([no])
107fi 116fi
108test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) 117test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
109AC_LIB_PROG_LD_GNU 118AC_LIB_PROG_LD_GNU
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index e3d26fc4..3522d994 100644
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -1,12 +1,12 @@
1# lib-link.m4 serial 13 (gettext-0.17) 1# lib-link.m4 serial 26 (gettext-0.18.2)
2dnl Copyright (C) 2001-2007 Free Software Foundation, Inc. 2dnl Copyright (C) 2001-2014 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved. 5dnl with or without modifications, as long as this notice is preserved.
6 6
7dnl From Bruno Haible. 7dnl From Bruno Haible.
8 8
9AC_PREREQ(2.54) 9AC_PREREQ([2.54])
10 10
11dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and 11dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
12dnl the libraries corresponding to explicit and implicit dependencies. 12dnl the libraries corresponding to explicit and implicit dependencies.
@@ -18,9 +18,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
18[ 18[
19 AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) 19 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
20 AC_REQUIRE([AC_LIB_RPATH]) 20 AC_REQUIRE([AC_LIB_RPATH])
21 define([Name],[translit([$1],[./-], [___])]) 21 pushdef([Name],[m4_translit([$1],[./+-], [____])])
22 define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], 22 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
23 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) 23 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
24 AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ 24 AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
25 AC_LIB_LINKFLAGS_BODY([$1], [$2]) 25 AC_LIB_LINKFLAGS_BODY([$1], [$2])
26 ac_cv_lib[]Name[]_libs="$LIB[]NAME" 26 ac_cv_lib[]Name[]_libs="$LIB[]NAME"
@@ -39,16 +39,17 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
39 dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the 39 dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
40 dnl results of this search when this library appears as a dependency. 40 dnl results of this search when this library appears as a dependency.
41 HAVE_LIB[]NAME=yes 41 HAVE_LIB[]NAME=yes
42 undefine([Name]) 42 popdef([NAME])
43 undefine([NAME]) 43 popdef([Name])
44]) 44])
45 45
46dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) 46dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
47dnl searches for libname and the libraries corresponding to explicit and 47dnl searches for libname and the libraries corresponding to explicit and
48dnl implicit dependencies, together with the specified include files and 48dnl implicit dependencies, together with the specified include files and
49dnl the ability to compile and link the specified testcode. If found, it 49dnl the ability to compile and link the specified testcode. The missing-message
50dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and 50dnl defaults to 'no' and may contain additional hints for the user.
51dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and 51dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
52dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
52dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs 53dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
53dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. 54dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
54dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname 55dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
@@ -57,9 +58,9 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
57[ 58[
58 AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) 59 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
59 AC_REQUIRE([AC_LIB_RPATH]) 60 AC_REQUIRE([AC_LIB_RPATH])
60 define([Name],[translit([$1],[./-], [___])]) 61 pushdef([Name],[m4_translit([$1],[./+-], [____])])
61 define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], 62 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
62 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) 63 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
63 64
64 dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME 65 dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
65 dnl accordingly. 66 dnl accordingly.
@@ -73,13 +74,26 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
73 74
74 AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ 75 AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
75 ac_save_LIBS="$LIBS" 76 ac_save_LIBS="$LIBS"
76 LIBS="$LIBS $LIB[]NAME" 77 dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
77 AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) 78 dnl because these -l options might require -L options that are present in
79 dnl LIBS. -l options benefit only from the -L options listed before it.
80 dnl Otherwise, add it to the front of LIBS, because it may be a static
81 dnl library that depends on another static library that is present in LIBS.
82 dnl Static libraries benefit only from the static libraries listed after
83 dnl it.
84 case " $LIB[]NAME" in
85 *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
86 *) LIBS="$LIB[]NAME $LIBS" ;;
87 esac
88 AC_LINK_IFELSE(
89 [AC_LANG_PROGRAM([[$3]], [[$4]])],
90 [ac_cv_lib[]Name=yes],
91 [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
78 LIBS="$ac_save_LIBS" 92 LIBS="$ac_save_LIBS"
79 ]) 93 ])
80 if test "$ac_cv_lib[]Name" = yes; then 94 if test "$ac_cv_lib[]Name" = yes; then
81 HAVE_LIB[]NAME=yes 95 HAVE_LIB[]NAME=yes
82 AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) 96 AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
83 AC_MSG_CHECKING([how to link with lib[]$1]) 97 AC_MSG_CHECKING([how to link with lib[]$1])
84 AC_MSG_RESULT([$LIB[]NAME]) 98 AC_MSG_RESULT([$LIB[]NAME])
85 else 99 else
@@ -95,13 +109,15 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
95 AC_SUBST([LIB]NAME) 109 AC_SUBST([LIB]NAME)
96 AC_SUBST([LTLIB]NAME) 110 AC_SUBST([LTLIB]NAME)
97 AC_SUBST([LIB]NAME[_PREFIX]) 111 AC_SUBST([LIB]NAME[_PREFIX])
98 undefine([Name]) 112 popdef([NAME])
99 undefine([NAME]) 113 popdef([Name])
100]) 114])
101 115
102dnl Determine the platform dependent parameters needed to use rpath: 116dnl Determine the platform dependent parameters needed to use rpath:
103dnl acl_libext, 117dnl acl_libext,
104dnl acl_shlibext, 118dnl acl_shlibext,
119dnl acl_libname_spec,
120dnl acl_library_names_spec,
105dnl acl_hardcode_libdir_flag_spec, 121dnl acl_hardcode_libdir_flag_spec,
106dnl acl_hardcode_libdir_separator, 122dnl acl_hardcode_libdir_separator,
107dnl acl_hardcode_direct, 123dnl acl_hardcode_direct,
@@ -114,7 +130,7 @@ AC_DEFUN([AC_LIB_RPATH],
114 AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld 130 AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
115 AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host 131 AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
116 AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir 132 AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
117 AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ 133 AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
118 CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ 134 CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
119 ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh 135 ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
120 . ./conftest.sh 136 . ./conftest.sh
@@ -131,11 +147,32 @@ AC_DEFUN([AC_LIB_RPATH],
131 acl_hardcode_direct="$acl_cv_hardcode_direct" 147 acl_hardcode_direct="$acl_cv_hardcode_direct"
132 acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" 148 acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
133 dnl Determine whether the user wants rpath handling at all. 149 dnl Determine whether the user wants rpath handling at all.
134 AC_ARG_ENABLE(rpath, 150 AC_ARG_ENABLE([rpath],
135 [ --disable-rpath do not hardcode runtime library paths], 151 [ --disable-rpath do not hardcode runtime library paths],
136 :, enable_rpath=yes) 152 :, enable_rpath=yes)
137]) 153])
138 154
155dnl AC_LIB_FROMPACKAGE(name, package)
156dnl declares that libname comes from the given package. The configure file
157dnl will then not have a --with-libname-prefix option but a
158dnl --with-package-prefix option. Several libraries can come from the same
159dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
160dnl macro call that searches for libname.
161AC_DEFUN([AC_LIB_FROMPACKAGE],
162[
163 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
164 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
165 define([acl_frompackage_]NAME, [$2])
166 popdef([NAME])
167 pushdef([PACK],[$2])
168 pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
169 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
170 define([acl_libsinpackage_]PACKUP,
171 m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
172 popdef([PACKUP])
173 popdef([PACK])
174])
175
139dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and 176dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
140dnl the libraries corresponding to explicit and implicit dependencies. 177dnl the libraries corresponding to explicit and implicit dependencies.
141dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. 178dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
@@ -144,19 +181,23 @@ dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
144AC_DEFUN([AC_LIB_LINKFLAGS_BODY], 181AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
145[ 182[
146 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) 183 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
147 define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], 184 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
148 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) 185 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
186 pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
187 pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
188 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
189 pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
149 dnl Autoconf >= 2.61 supports dots in --with options. 190 dnl Autoconf >= 2.61 supports dots in --with options.
150 define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])]) 191 pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])
151 dnl By default, look in $includedir and $libdir. 192 dnl By default, look in $includedir and $libdir.
152 use_additional=yes 193 use_additional=yes
153 AC_LIB_WITH_FINAL_PREFIX([ 194 AC_LIB_WITH_FINAL_PREFIX([
154 eval additional_includedir=\"$includedir\" 195 eval additional_includedir=\"$includedir\"
155 eval additional_libdir=\"$libdir\" 196 eval additional_libdir=\"$libdir\"
156 ]) 197 ])
157 AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix], 198 AC_ARG_WITH(P_A_C_K[-prefix],
158[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib 199[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
159 --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir], 200 --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
160[ 201[
161 if test "X$withval" = "Xno"; then 202 if test "X$withval" = "Xno"; then
162 use_additional=no 203 use_additional=no
@@ -169,6 +210,10 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
169 else 210 else
170 additional_includedir="$withval/include" 211 additional_includedir="$withval/include"
171 additional_libdir="$withval/$acl_libdirstem" 212 additional_libdir="$withval/$acl_libdirstem"
213 if test "$acl_libdirstem2" != "$acl_libdirstem" \
214 && ! test -d "$withval/$acl_libdirstem"; then
215 additional_libdir="$withval/$acl_libdirstem2"
216 fi
172 fi 217 fi
173 fi 218 fi
174]) 219])
@@ -178,6 +223,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
178 LTLIB[]NAME= 223 LTLIB[]NAME=
179 INC[]NAME= 224 INC[]NAME=
180 LIB[]NAME[]_PREFIX= 225 LIB[]NAME[]_PREFIX=
226 dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
227 dnl computed. So it has to be reset here.
228 HAVE_LIB[]NAME=
181 rpathdirs= 229 rpathdirs=
182 ltrpathdirs= 230 ltrpathdirs=
183 names_already_handled= 231 names_already_handled=
@@ -197,7 +245,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
197 names_already_handled="$names_already_handled $name" 245 names_already_handled="$names_already_handled $name"
198 dnl See if it was already located by an earlier AC_LIB_LINKFLAGS 246 dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
199 dnl or AC_LIB_HAVE_LINKFLAGS call. 247 dnl or AC_LIB_HAVE_LINKFLAGS call.
200 uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` 248 uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
201 eval value=\"\$HAVE_LIB$uppername\" 249 eval value=\"\$HAVE_LIB$uppername\"
202 if test -n "$value"; then 250 if test -n "$value"; then
203 if test "$value" = yes; then 251 if test "$value" = yes; then
@@ -327,7 +375,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
327 dnl Linking with a shared library. We attempt to hardcode its 375 dnl Linking with a shared library. We attempt to hardcode its
328 dnl directory into the executable's runpath, unless it's the 376 dnl directory into the executable's runpath, unless it's the
329 dnl standard /usr/lib. 377 dnl standard /usr/lib.
330 if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then 378 if test "$enable_rpath" = no \
379 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
380 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
331 dnl No hardcoding is needed. 381 dnl No hardcoding is needed.
332 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" 382 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
333 else 383 else
@@ -415,7 +465,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
415 case "$found_dir" in 465 case "$found_dir" in
416 */$acl_libdirstem | */$acl_libdirstem/) 466 */$acl_libdirstem | */$acl_libdirstem/)
417 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` 467 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
418 LIB[]NAME[]_PREFIX="$basedir" 468 if test "$name" = '$1'; then
469 LIB[]NAME[]_PREFIX="$basedir"
470 fi
471 additional_includedir="$basedir/include"
472 ;;
473 */$acl_libdirstem2 | */$acl_libdirstem2/)
474 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
475 if test "$name" = '$1'; then
476 LIB[]NAME[]_PREFIX="$basedir"
477 fi
419 additional_includedir="$basedir/include" 478 additional_includedir="$basedir/include"
420 ;; 479 ;;
421 esac 480 esac
@@ -476,9 +535,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
476 dnl 3. if it's already present in $LDFLAGS or the already 535 dnl 3. if it's already present in $LDFLAGS or the already
477 dnl constructed $LIBNAME, 536 dnl constructed $LIBNAME,
478 dnl 4. if it doesn't exist as a directory. 537 dnl 4. if it doesn't exist as a directory.
479 if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then 538 if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
539 && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
480 haveit= 540 haveit=
481 if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then 541 if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
542 || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
482 if test -n "$GCC"; then 543 if test -n "$GCC"; then
483 case $host_os in 544 case $host_os in
484 linux* | gnu* | k*bsd*-gnu) haveit=yes;; 545 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
@@ -609,6 +670,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
609 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" 670 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
610 done 671 done
611 fi 672 fi
673 popdef([P_A_C_K])
674 popdef([PACKLIBS])
675 popdef([PACKUP])
676 popdef([PACK])
677 popdef([NAME])
612]) 678])
613 679
614dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, 680dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
@@ -654,7 +720,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
654 if test -n "$next"; then 720 if test -n "$next"; then
655 dir="$next" 721 dir="$next"
656 dnl No need to hardcode the standard /usr/lib. 722 dnl No need to hardcode the standard /usr/lib.
657 if test "X$dir" != "X/usr/$acl_libdirstem"; then 723 if test "X$dir" != "X/usr/$acl_libdirstem" \
724 && test "X$dir" != "X/usr/$acl_libdirstem2"; then
658 rpathdirs="$rpathdirs $dir" 725 rpathdirs="$rpathdirs $dir"
659 fi 726 fi
660 next= 727 next=
@@ -663,7 +730,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
663 -L) next=yes ;; 730 -L) next=yes ;;
664 -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` 731 -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
665 dnl No need to hardcode the standard /usr/lib. 732 dnl No need to hardcode the standard /usr/lib.
666 if test "X$dir" != "X/usr/$acl_libdirstem"; then 733 if test "X$dir" != "X/usr/$acl_libdirstem" \
734 && test "X$dir" != "X/usr/$acl_libdirstem2"; then
667 rpathdirs="$rpathdirs $dir" 735 rpathdirs="$rpathdirs $dir"
668 fi 736 fi
669 next= ;; 737 next= ;;
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index a8684e17..31f49e40 100644
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -1,5 +1,5 @@
1# lib-prefix.m4 serial 5 (gettext-0.15) 1# lib-prefix.m4 serial 7 (gettext-0.18)
2dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. 2dnl Copyright (C) 2001-2005, 2008-2014 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved. 5dnl with or without modifications, as long as this notice is preserved.
@@ -153,33 +153,72 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
153 prefix="$acl_save_prefix" 153 prefix="$acl_save_prefix"
154]) 154])
155 155
156dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing 156dnl AC_LIB_PREPARE_MULTILIB creates
157dnl the basename of the libdir, either "lib" or "lib64". 157dnl - a variable acl_libdirstem, containing the basename of the libdir, either
158dnl "lib" or "lib64" or "lib/64",
159dnl - a variable acl_libdirstem2, as a secondary possible value for
160dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
161dnl "lib/amd64".
158AC_DEFUN([AC_LIB_PREPARE_MULTILIB], 162AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
159[ 163[
160 dnl There is no formal standard regarding lib and lib64. The current 164 dnl There is no formal standard regarding lib and lib64.
161 dnl practice is that on a system supporting 32-bit and 64-bit instruction 165 dnl On glibc systems, the current practice is that on a system supporting
162 dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit 166 dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
163 dnl libraries go under $prefix/lib. We determine the compiler's default 167 dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
164 dnl mode by looking at the compiler's library search path. If at least 168 dnl the compiler's default mode by looking at the compiler's library search
165 dnl of its elements ends in /lib64 or points to a directory whose absolute 169 dnl path. If at least one of its elements ends in /lib64 or points to a
166 dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the 170 dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
167 dnl default, namely "lib". 171 dnl Otherwise we use the default, namely "lib".
172 dnl On Solaris systems, the current practice is that on a system supporting
173 dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
174 dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
175 dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
176 AC_REQUIRE([AC_CANONICAL_HOST])
168 acl_libdirstem=lib 177 acl_libdirstem=lib
169 searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` 178 acl_libdirstem2=
170 if test -n "$searchpath"; then 179 case "$host_os" in
171 acl_save_IFS="${IFS= }"; IFS=":" 180 solaris*)
172 for searchdir in $searchpath; do 181 dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
173 if test -d "$searchdir"; then 182 dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
174 case "$searchdir" in 183 dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
175 */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; 184 dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
176 *) searchdir=`cd "$searchdir" && pwd` 185 dnl symlink is missing, so we set acl_libdirstem2 too.
177 case "$searchdir" in 186 AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
178 */lib64 ) acl_libdirstem=lib64 ;; 187 [AC_EGREP_CPP([sixtyfour bits], [
179 esac ;; 188#ifdef _LP64
189sixtyfour bits
190#endif
191 ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
192 ])
193 if test $gl_cv_solaris_64bit = yes; then
194 acl_libdirstem=lib/64
195 case "$host_cpu" in
196 sparc*) acl_libdirstem2=lib/sparcv9 ;;
197 i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
180 esac 198 esac
181 fi 199 fi
182 done 200 ;;
183 IFS="$acl_save_IFS" 201 *)
184 fi 202 searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
203 if test -n "$searchpath"; then
204 acl_save_IFS="${IFS= }"; IFS=":"
205 for searchdir in $searchpath; do
206 if test -d "$searchdir"; then
207 case "$searchdir" in
208 */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
209 */../ | */.. )
210 # Better ignore directories of this form. They are misleading.
211 ;;
212 *) searchdir=`cd "$searchdir" && pwd`
213 case "$searchdir" in
214 */lib64 ) acl_libdirstem=lib64 ;;
215 esac ;;
216 esac
217 fi
218 done
219 IFS="$acl_save_IFS"
220 fi
221 ;;
222 esac
223 test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
185]) 224])
diff --git a/m4/nls.m4 b/m4/nls.m4
index 7967cc2f..53cdc8be 100644
--- a/m4/nls.m4
+++ b/m4/nls.m4
@@ -1,5 +1,6 @@
1# nls.m4 serial 3 (gettext-0.15) 1# nls.m4 serial 5 (gettext-0.18)
2dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. 2dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
3dnl Inc.
3dnl This file is free software; the Free Software Foundation 4dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 5dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved. 6dnl with or without modifications, as long as this notice is preserved.
@@ -17,15 +18,15 @@ dnl Authors:
17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. 18dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. 19dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
19 20
20AC_PREREQ(2.50) 21AC_PREREQ([2.50])
21 22
22AC_DEFUN([AM_NLS], 23AC_DEFUN([AM_NLS],
23[ 24[
24 AC_MSG_CHECKING([whether NLS is requested]) 25 AC_MSG_CHECKING([whether NLS is requested])
25 dnl Default is enabled NLS 26 dnl Default is enabled NLS
26 AC_ARG_ENABLE(nls, 27 AC_ARG_ENABLE([nls],
27 [ --disable-nls do not use Native Language Support], 28 [ --disable-nls do not use Native Language Support],
28 USE_NLS=$enableval, USE_NLS=yes) 29 USE_NLS=$enableval, USE_NLS=yes)
29 AC_MSG_RESULT($USE_NLS) 30 AC_MSG_RESULT([$USE_NLS])
30 AC_SUBST(USE_NLS) 31 AC_SUBST([USE_NLS])
31]) 32])
diff --git a/m4/po.m4 b/m4/po.m4
index 0734762a..84659ea5 100644
--- a/m4/po.m4
+++ b/m4/po.m4
@@ -1,5 +1,5 @@
1# po.m4 serial 15 (gettext-0.17) 1# po.m4 serial 22 (gettext-0.19)
2dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. 2dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved. 5dnl with or without modifications, as long as this notice is preserved.
@@ -17,19 +17,20 @@ dnl Authors:
17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. 17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. 18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
19 19
20AC_PREREQ(2.50) 20AC_PREREQ([2.60])
21 21
22dnl Checks for all prerequisites of the po subdirectory. 22dnl Checks for all prerequisites of the po subdirectory.
23AC_DEFUN([AM_PO_SUBDIRS], 23AC_DEFUN([AM_PO_SUBDIRS],
24[ 24[
25 AC_REQUIRE([AC_PROG_MAKE_SET])dnl 25 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
26 AC_REQUIRE([AC_PROG_INSTALL])dnl 26 AC_REQUIRE([AC_PROG_INSTALL])dnl
27 AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake 27 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
28 AC_REQUIRE([AC_PROG_SED])dnl
28 AC_REQUIRE([AM_NLS])dnl 29 AC_REQUIRE([AM_NLS])dnl
29 30
30 dnl Release version of the gettext macros. This is used to ensure that 31 dnl Release version of the gettext macros. This is used to ensure that
31 dnl the gettext macros and po/Makefile.in.in are in sync. 32 dnl the gettext macros and po/Makefile.in.in are in sync.
32 AC_SUBST([GETTEXT_MACRO_VERSION], [0.17]) 33 AC_SUBST([GETTEXT_MACRO_VERSION], [0.19])
33 34
34 dnl Perform the following tests also if --disable-nls has been given, 35 dnl Perform the following tests also if --disable-nls has been given,
35 dnl because they are needed for "make dist" to work. 36 dnl because they are needed for "make dist" to work.
@@ -41,7 +42,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
41 [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && 42 [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
42 (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], 43 (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
43 :) 44 :)
44 AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) 45 AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
45 46
46 dnl Test whether it is GNU msgfmt >= 0.15. 47 dnl Test whether it is GNU msgfmt >= 0.15.
47changequote(,)dnl 48changequote(,)dnl
@@ -102,7 +103,7 @@ changequote([,])dnl
102 case "$ac_file" in */Makefile.in) 103 case "$ac_file" in */Makefile.in)
103 # Adjust a relative srcdir. 104 # Adjust a relative srcdir.
104 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` 105 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
105 ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" 106 ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
106 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` 107 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
107 # In autoconf-2.13 it is called $ac_given_srcdir. 108 # In autoconf-2.13 it is called $ac_given_srcdir.
108 # In autoconf-2.50 it is called $srcdir. 109 # In autoconf-2.50 it is called $srcdir.
@@ -118,7 +119,8 @@ changequote([,])dnl
118 if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then 119 if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
119 rm -f "$ac_dir/POTFILES" 120 rm -f "$ac_dir/POTFILES"
120 test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" 121 test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
121 cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" 122 gt_tab=`printf '\t'`
123 cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
122 POMAKEFILEDEPS="POTFILES.in" 124 POMAKEFILEDEPS="POTFILES.in"
123 # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend 125 # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
124 # on $ac_dir but don't depend on user-specified configuration 126 # on $ac_dir but don't depend on user-specified configuration
@@ -129,12 +131,12 @@ changequote([,])dnl
129 test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" 131 test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
130 fi 132 fi
131 ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` 133 ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
132 # Hide the ALL_LINGUAS assigment from automake < 1.5. 134 # Hide the ALL_LINGUAS assignment from automake < 1.5.
133 eval 'ALL_LINGUAS''=$ALL_LINGUAS_' 135 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
134 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" 136 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
135 else 137 else
136 # The set of available languages was given in configure.in. 138 # The set of available languages was given in configure.in.
137 # Hide the ALL_LINGUAS assigment from automake < 1.5. 139 # Hide the ALL_LINGUAS assignment from automake < 1.5.
138 eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' 140 eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
139 fi 141 fi
140 # Compute POFILES 142 # Compute POFILES
@@ -226,7 +228,7 @@ AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
226changequote(,)dnl 228changequote(,)dnl
227 # Adjust a relative srcdir. 229 # Adjust a relative srcdir.
228 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` 230 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
229 ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" 231 ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
230 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` 232 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
231 # In autoconf-2.13 it is called $ac_given_srcdir. 233 # In autoconf-2.13 it is called $ac_given_srcdir.
232 # In autoconf-2.50 it is called $srcdir. 234 # In autoconf-2.50 it is called $srcdir.
@@ -254,6 +256,7 @@ EOT
254 fi 256 fi
255 257
256 # A sed script that extracts the value of VARIABLE from a Makefile. 258 # A sed script that extracts the value of VARIABLE from a Makefile.
259 tab=`printf '\t'`
257 sed_x_variable=' 260 sed_x_variable='
258# Test if the hold space is empty. 261# Test if the hold space is empty.
259x 262x
@@ -261,9 +264,9 @@ s/P/P/
261x 264x
262ta 265ta
263# Yes it was empty. Look if we have the expected variable definition. 266# Yes it was empty. Look if we have the expected variable definition.
264/^[ ]*VARIABLE[ ]*=/{ 267/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
265 # Seen the first line of the variable definition. 268 # Seen the first line of the variable definition.
266 s/^[ ]*VARIABLE[ ]*=// 269 s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
267 ba 270 ba
268} 271}
269bd 272bd
@@ -315,7 +318,7 @@ changequote([,])dnl
315 sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'` 318 sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
316 ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` 319 ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
317 fi 320 fi
318 # Hide the ALL_LINGUAS assigment from automake < 1.5. 321 # Hide the ALL_LINGUAS assignment from automake < 1.5.
319 eval 'ALL_LINGUAS''=$ALL_LINGUAS_' 322 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
320 # Compute POFILES 323 # Compute POFILES
321 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) 324 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
@@ -405,14 +408,15 @@ changequote([,])dnl
405 fi 408 fi
406 409
407 sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp" 410 sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
411 tab=`printf '\t'`
408 if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then 412 if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
409 # Add dependencies that cannot be formulated as a simple suffix rule. 413 # Add dependencies that cannot be formulated as a simple suffix rule.
410 for lang in $ALL_LINGUAS; do 414 for lang in $ALL_LINGUAS; do
411 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` 415 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
412 cat >> "$ac_file.tmp" <<EOF 416 cat >> "$ac_file.tmp" <<EOF
413$frobbedlang.msg: $lang.po 417$frobbedlang.msg: $lang.po
414 @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \ 418${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
415 \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } 419${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
416EOF 420EOF
417 done 421 done
418 fi 422 fi
@@ -422,8 +426,8 @@ EOF
422 frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` 426 frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
423 cat >> "$ac_file.tmp" <<EOF 427 cat >> "$ac_file.tmp" <<EOF
424$frobbedlang/\$(DOMAIN).resources.dll: $lang.po 428$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
425 @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \ 429${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
426 \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } 430${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
427EOF 431EOF
428 done 432 done
429 fi 433 fi
diff --git a/m4/progtest.m4 b/m4/progtest.m4
index a56365cd..b499f79c 100644
--- a/m4/progtest.m4
+++ b/m4/progtest.m4
@@ -1,5 +1,5 @@
1# progtest.m4 serial 4 (gettext-0.14.2) 1# progtest.m4 serial 7 (gettext-0.18.2)
2dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc. 2dnl Copyright (C) 1996-2003, 2005, 2008-2014 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved. 5dnl with or without modifications, as long as this notice is preserved.
@@ -16,7 +16,7 @@ dnl They are *not* in the public domain.
16dnl Authors: 16dnl Authors:
17dnl Ulrich Drepper <drepper@cygnus.com>, 1996. 17dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
18 18
19AC_PREREQ(2.50) 19AC_PREREQ([2.50])
20 20
21# Search path for a program which passes the given test. 21# Search path for a program which passes the given test.
22 22
@@ -27,15 +27,14 @@ AC_DEFUN([AM_PATH_PROG_WITH_TEST],
27# Prepare PATH_SEPARATOR. 27# Prepare PATH_SEPARATOR.
28# The user is always right. 28# The user is always right.
29if test "${PATH_SEPARATOR+set}" != set; then 29if test "${PATH_SEPARATOR+set}" != set; then
30 echo "#! /bin/sh" >conf$$.sh 30 # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
31 echo "exit 0" >>conf$$.sh 31 # contains only /bin. Note that ksh looks also at the FPATH variable,
32 chmod +x conf$$.sh 32 # so we have to set that as well for the test.
33 if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then 33 PATH_SEPARATOR=:
34 PATH_SEPARATOR=';' 34 (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
35 else 35 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
36 PATH_SEPARATOR=: 36 || PATH_SEPARATOR=';'
37 fi 37 }
38 rm -f conf$$.sh
39fi 38fi
40 39
41# Find out how to test for executable files. Don't use a zero-byte file, 40# Find out how to test for executable files. Don't use a zero-byte file,
@@ -55,7 +54,7 @@ rm -f conf$$.file
55# Extract the first word of "$2", so it can be a program name with args. 54# Extract the first word of "$2", so it can be a program name with args.
56set dummy $2; ac_word=[$]2 55set dummy $2; ac_word=[$]2
57AC_MSG_CHECKING([for $ac_word]) 56AC_MSG_CHECKING([for $ac_word])
58AC_CACHE_VAL(ac_cv_path_$1, 57AC_CACHE_VAL([ac_cv_path_$1],
59[case "[$]$1" in 58[case "[$]$1" in
60 [[\\/]]* | ?:[[\\/]]*) 59 [[\\/]]* | ?:[[\\/]]*)
61 ac_cv_path_$1="[$]$1" # Let the user override the test with a path. 60 ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
@@ -84,9 +83,9 @@ ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
84esac])dnl 83esac])dnl
85$1="$ac_cv_path_$1" 84$1="$ac_cv_path_$1"
86if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then 85if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
87 AC_MSG_RESULT([$]$1) 86 AC_MSG_RESULT([$][$1])
88else 87else
89 AC_MSG_RESULT(no) 88 AC_MSG_RESULT([no])
90fi 89fi
91AC_SUBST($1)dnl 90AC_SUBST([$1])dnl
92]) 91])
diff --git a/po/ChangeLog b/po/ChangeLog
index 30a6c99f..9c697355 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
12015-05-18 gettextize <bug-gnu-gettext@gnu.org>
2
3 * Makefile.in.in: Upgrade to gettext-0.19.3.
4 * Rules-quot: Upgrade to gettext-0.19.3.
5
12010-06-02 gettextize <bug-gnu-gettext@gnu.org> 62010-06-02 gettextize <bug-gnu-gettext@gnu.org>
2 7
3 * Makefile.in.in: Upgrade to gettext-0.17. 8 * Makefile.in.in: Upgrade to gettext-0.17.
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 0df87cac..65184f65 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,5 +1,5 @@
1# Makefile for PO directory in any package using GNU gettext. 1# Makefile for PO directory in any package using GNU gettext.
2# Copyright (C) 1995-1997, 2000-2007 by Ulrich Drepper <drepper@gnu.ai.mit.edu> 2# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
3# 3#
4# This file can be copied and used freely without restrictions. It can 4# This file can be copied and used freely without restrictions. It can
5# be used in projects which are not available under the GNU General Public 5# be used in projects which are not available under the GNU General Public
@@ -8,13 +8,14 @@
8# Please note that the actual code of GNU gettext is covered by the GNU 8# Please note that the actual code of GNU gettext is covered by the GNU
9# General Public License and is *not* in the public domain. 9# General Public License and is *not* in the public domain.
10# 10#
11# Origin: gettext-0.17 11# Origin: gettext-0.19
12GETTEXT_MACRO_VERSION = 0.17 12GETTEXT_MACRO_VERSION = 0.19
13 13
14PACKAGE = @PACKAGE@ 14PACKAGE = @PACKAGE@
15VERSION = @VERSION@ 15VERSION = @VERSION@
16PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ 16PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
17 17
18SED = @SED@
18SHELL = /bin/sh 19SHELL = /bin/sh
19@SET_MAKE@ 20@SET_MAKE@
20 21
@@ -76,6 +77,16 @@ POTFILES = \
76 77
77CATALOGS = @CATALOGS@ 78CATALOGS = @CATALOGS@
78 79
80POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot
81POFILESDEPS_yes = $(POFILESDEPS_)
82POFILESDEPS_no =
83POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT))
84
85DISTFILESDEPS_ = update-po
86DISTFILESDEPS_yes = $(DISTFILESDEPS_)
87DISTFILESDEPS_no =
88DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
89
79# Makevars gets inserted here. (Don't remove this line!) 90# Makevars gets inserted here. (Don't remove this line!)
80 91
81.SUFFIXES: 92.SUFFIXES:
@@ -88,22 +99,22 @@ CATALOGS = @CATALOGS@
88.po.gmo: 99.po.gmo:
89 @lang=`echo $* | sed -e 's,.*/,,'`; \ 100 @lang=`echo $* | sed -e 's,.*/,,'`; \
90 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ 101 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
91 echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ 102 echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
92 cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo 103 cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
93 104
94.sin.sed: 105.sin.sed:
95 sed -e '/^#/d' $< > t-$@ 106 sed -e '/^#/d' $< > t-$@
96 mv t-$@ $@ 107 mv t-$@ $@
97 108
98 109
99all: check-macro-version all-@USE_NLS@ 110all: all-@USE_NLS@
100 111
101all-yes: stamp-po 112all-yes: stamp-po
102all-no: 113all-no:
103 114
104# Ensure that the gettext macros and this Makefile.in.in are in sync. 115# Ensure that the gettext macros and this Makefile.in.in are in sync.
105check-macro-version: 116CHECK_MACRO_VERSION = \
106 @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ 117 test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
107 || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \ 118 || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
108 exit 1; \ 119 exit 1; \
109 } 120 }
@@ -123,6 +134,7 @@ check-macro-version:
123# $(POFILES) has been designed to not touch files that don't need to be 134# $(POFILES) has been designed to not touch files that don't need to be
124# changed. 135# changed.
125stamp-po: $(srcdir)/$(DOMAIN).pot 136stamp-po: $(srcdir)/$(DOMAIN).pot
137 @$(CHECK_MACRO_VERSION)
126 test ! -f $(srcdir)/$(DOMAIN).pot || \ 138 test ! -f $(srcdir)/$(DOMAIN).pot || \
127 test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) 139 test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
128 @test ! -f $(srcdir)/$(DOMAIN).pot || { \ 140 @test ! -f $(srcdir)/$(DOMAIN).pot || { \
@@ -137,11 +149,29 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
137 149
138# This target rebuilds $(DOMAIN).pot; it is an expensive operation. 150# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
139# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. 151# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
152# The determination of whether the package xyz is a GNU one is based on the
153# heuristic whether some file in the top level directory mentions "GNU xyz".
154# If GNU 'find' is available, we avoid grepping through monster files.
140$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed 155$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
141 if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \ 156 package_gnu="$(PACKAGE_GNU)"; \
142 package_gnu='GNU '; \ 157 test -n "$$package_gnu" || { \
158 if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
159 LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \
160 -size -10000000c -exec grep 'GNU @PACKAGE@' \
161 /dev/null '{}' ';' 2>/dev/null; \
162 else \
163 LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
164 fi; \
165 } | grep -v 'libtool:' >/dev/null; then \
166 package_gnu=yes; \
167 else \
168 package_gnu=no; \
169 fi; \
170 }; \
171 if test "$$package_gnu" = "yes"; then \
172 package_prefix='GNU '; \
143 else \ 173 else \
144 package_gnu=''; \ 174 package_prefix=''; \
145 fi; \ 175 fi; \
146 if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ 176 if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
147 msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ 177 msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
@@ -161,7 +191,7 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
161 --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ 191 --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
162 --files-from=$(srcdir)/POTFILES.in \ 192 --files-from=$(srcdir)/POTFILES.in \
163 --copyright-holder='$(COPYRIGHT_HOLDER)' \ 193 --copyright-holder='$(COPYRIGHT_HOLDER)' \
164 --package-name="$${package_gnu}@PACKAGE@" \ 194 --package-name="$${package_prefix}@PACKAGE@" \
165 --package-version='@VERSION@' \ 195 --package-version='@VERSION@' \
166 --msgid-bugs-address="$$msgid_bugs_address" \ 196 --msgid-bugs-address="$$msgid_bugs_address" \
167 ;; \ 197 ;; \
@@ -189,12 +219,20 @@ $(srcdir)/$(DOMAIN).pot:
189 219
190# This target rebuilds a PO file if $(DOMAIN).pot has changed. 220# This target rebuilds a PO file if $(DOMAIN).pot has changed.
191# Note that a PO file is not touched if it doesn't need to be changed. 221# Note that a PO file is not touched if it doesn't need to be changed.
192$(POFILES): $(srcdir)/$(DOMAIN).pot 222$(POFILES): $(POFILESDEPS)
193 @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ 223 @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
194 if test -f "$(srcdir)/$${lang}.po"; then \ 224 if test -f "$(srcdir)/$${lang}.po"; then \
225 test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \
195 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ 226 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
196 echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ 227 echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
197 cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \ 228 cd $(srcdir) \
229 && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
230 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
231 $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
232 *) \
233 $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
234 esac; \
235 }; \
198 else \ 236 else \
199 $(MAKE) $${lang}.po-create; \ 237 $(MAKE) $${lang}.po-create; \
200 fi 238 fi
@@ -217,7 +255,6 @@ install-data: install-data-@USE_NLS@
217 fi 255 fi
218install-data-no: all 256install-data-no: all
219install-data-yes: all 257install-data-yes: all
220 $(mkdir_p) $(DESTDIR)$(datadir)
221 @catalogs='$(CATALOGS)'; \ 258 @catalogs='$(CATALOGS)'; \
222 for cat in $$catalogs; do \ 259 for cat in $$catalogs; do \
223 cat=`basename $$cat`; \ 260 cat=`basename $$cat`; \
@@ -269,7 +306,6 @@ installdirs-data: installdirs-data-@USE_NLS@
269 fi 306 fi
270installdirs-data-no: 307installdirs-data-no:
271installdirs-data-yes: 308installdirs-data-yes:
272 $(mkdir_p) $(DESTDIR)$(datadir)
273 @catalogs='$(CATALOGS)'; \ 309 @catalogs='$(CATALOGS)'; \
274 for cat in $$catalogs; do \ 310 for cat in $$catalogs; do \
275 cat=`basename $$cat`; \ 311 cat=`basename $$cat`; \
@@ -347,7 +383,7 @@ maintainer-clean: distclean
347 383
348distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) 384distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
349dist distdir: 385dist distdir:
350 $(MAKE) update-po 386 test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
351 @$(MAKE) dist2 387 @$(MAKE) dist2
352# This is a separate target because 'update-po' must be executed before. 388# This is a separate target because 'update-po' must be executed before.
353dist2: stamp-po $(DISTFILES) 389dist2: stamp-po $(DISTFILES)
@@ -395,9 +431,15 @@ update-po: Makefile
395 tmpdir=`pwd`; \ 431 tmpdir=`pwd`; \
396 echo "$$lang:"; \ 432 echo "$$lang:"; \
397 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ 433 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
398 echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ 434 echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
399 cd $(srcdir); \ 435 cd $(srcdir); \
400 if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ 436 if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
437 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
438 $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
439 *) \
440 $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
441 esac; \
442 }; then \
401 if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ 443 if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
402 rm -f $$tmpdir/$$lang.new.po; \ 444 rm -f $$tmpdir/$$lang.new.po; \
403 else \ 445 else \
diff --git a/po/Rules-quot b/po/Rules-quot
index 9c2a995e..9dc96307 100644
--- a/po/Rules-quot
+++ b/po/Rules-quot
@@ -1,3 +1,4 @@
1# This file, Rules-quot, can be copied and used freely without restrictions.
1# Special Makefile rules for English message catalogs with quotation marks. 2# Special Makefile rules for English message catalogs with quotation marks.
2 3
3DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot 4DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
@@ -14,13 +15,23 @@ en@boldquot.po-update: en@boldquot.po-update-en
14 15
15.insert-header.po-update-en: 16.insert-header.po-update-en:
16 @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \ 17 @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
17 if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ 18 if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
18 tmpdir=`pwd`; \ 19 tmpdir=`pwd`; \
19 echo "$$lang:"; \ 20 echo "$$lang:"; \
20 ll=`echo $$lang | sed -e 's/@.*//'`; \ 21 ll=`echo $$lang | sed -e 's/@.*//'`; \
21 LC_ALL=C; export LC_ALL; \ 22 LC_ALL=C; export LC_ALL; \
22 cd $(srcdir); \ 23 cd $(srcdir); \
23 if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ 24 if $(MSGINIT) $(MSGINIT_OPTIONS) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \
25 | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \
26 { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
27 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \
28 $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \
29 ;; \
30 *) \
31 $(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \
32 ;; \
33 esac } 2>/dev/null > $$tmpdir/$$lang.new.po \
34 ; then \
24 if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ 35 if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
25 rm -f $$tmpdir/$$lang.new.po; \ 36 rm -f $$tmpdir/$$lang.new.po; \
26 else \ 37 else \
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-22 04:18:24 +0000