aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-05-18 19:57:24 +0000
committerChristian Grothoff <christian@grothoff.org>2015-05-18 19:57:24 +0000
commit755b04521a5b37ceac529df984c9ca1e466741c6 (patch)
treef44b464dcad4c03281027aa95ca5e1dd11b2e7b9
parent55406e60956ebbd4e50e0907e0bcd94df5f71d55 (diff)
downloadgnunet-755b04521a5b37ceac529df984c9ca1e466741c6.tar.gz
gnunet-755b04521a5b37ceac529df984c9ca1e466741c6.zip
-gettext and libtoolize updates
Diffstat
-rw-r--r--ABOUT-NLS2025
-rwxr-xr-xconfig.rpath230
-rw-r--r--configure.ac2
-rw-r--r--m4/ChangeLog9
-rw-r--r--m4/codeset.m418
-rw-r--r--m4/extern-inline.m499
-rw-r--r--m4/fcntl-o.m4134
-rw-r--r--m4/glibc2.m421
-rw-r--r--m4/glibc21.m426
-rw-r--r--m4/iconv.m4223
-rw-r--r--m4/intdiv0.m455
-rw-r--r--m4/intldir.m46
-rw-r--r--m4/intlmacosx.m456
-rw-r--r--m4/intmax.m421
-rw-r--r--m4/inttypes-pri.m420
-rw-r--r--m4/inttypes_h.m423
-rw-r--r--m4/lcmessage.m417
-rw-r--r--m4/lib-ld.m487
-rw-r--r--m4/lib-link.m4311
-rw-r--r--m4/lib-prefix.m491
-rw-r--r--m4/lock.m4323
-rw-r--r--m4/longlong.m4119
-rw-r--r--m4/nls.m413
-rw-r--r--m4/printf-posix.m426
-rw-r--r--m4/progtest.m431
-rw-r--r--m4/size_max.m447
-rw-r--r--m4/stdint_h.m421
-rw-r--r--m4/threadlib.m4389
-rw-r--r--m4/uintmax_t.m414
-rw-r--r--m4/visibility.m449
-rw-r--r--m4/wint_t.m426
-rw-r--r--m4/xsize.m47
-rw-r--r--po/ChangeLog5
-rw-r--r--po/Makefile.in.in108
-rw-r--r--po/Makevars.template37
-rw-r--r--po/POTFILES.in5
-rw-r--r--po/Rules-quot15
37 files changed, 3010 insertions, 1699 deletions
diff --git a/ABOUT-NLS b/ABOUT-NLS
index ec20977e0..b1de1b683 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,13 +51,16 @@ 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
103only have to set the `LANG' environment variable to the appropriate 58only have to set the `LANG' environment variable to the appropriate
104`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code, 59`LL_CC' combination. If you happen to have the `LC_ALL' or some other
105and `CC' is an ISO 3166 two-letter country code. For example, let's 60`LC_xxx' environment variables set, you should unset them before
61setting `LANG', otherwise the setting of `LANG' will not have the
62desired effect. Here `LL' is an ISO 639 two-letter language code, and
63`CC' is an ISO 3166 two-letter country code. For example, let's
106suppose that you speak German and live in Germany. At the shell 64suppose that you speak German and live in Germany. At the shell
107prompt, merely execute `setenv LANG de_DE' (in `csh'), 65prompt, merely execute `setenv LANG de_DE' (in `csh'),
108`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash'). 66`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
@@ -145,7 +103,7 @@ to denote the language's main dialect. For example, `de' is equivalent
145to `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'
146(Portuguese as spoken in Portugal) in this context. 104(Portuguese as spoken in Portugal) in this context.
147 105
1481.4 Translating Teams 1061.3 Translating Teams
149===================== 107=====================
150 108
151For the Free Translation Project to be a success, we need interested 109For the Free Translation Project to be a success, we need interested
@@ -153,8 +111,7 @@ people who like their own language and write it well, and who are also
153able to synergize with other translators speaking the same language. 111able to synergize with other translators speaking the same language.
154Each translation team has its own mailing list. The up-to-date list of 112Each translation team has its own mailing list. The up-to-date list of
155teams can be found at the Free Translation Project's homepage, 113teams can be found at the Free Translation Project's homepage,
156`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams" 114`http://translationproject.org/', in the "Teams" area.
157area.
158 115
159 If you'd like to volunteer to _work_ at translating messages, you 116 If you'd like to volunteer to _work_ at translating messages, you
160should become a member of the translating team for your own language. 117should become a member of the translating team for your own language.
@@ -168,901 +125,1125 @@ message to `sv-request@li.org', having this message body:
168_actively_ in translations, or at solving translational difficulties, 125_actively_ in translations, or at solving translational difficulties,
169rather than merely lurking around. If your team does not exist yet and 126rather than merely lurking around. If your team does not exist yet and
170you want to start one, or if you are unsure about what to do or how to 127you want to start one, or if you are unsure about what to do or how to
171get started, please write to `translation@iro.umontreal.ca' to reach the 128get started, please write to `coordinator@translationproject.org' to
172coordinator for all translator teams. 129reach the coordinator for all translator teams.
173 130
174 The English team is special. It works at improving and uniformizing 131 The English team is special. It works at improving and uniformizing
175the terminology in use. Proven linguistic skills are praised more than 132the terminology in use. Proven linguistic skills are praised more than
176programming skills, here. 133programming skills, here.
177 134
1781.5 Available Packages 1351.4 Available Packages
179====================== 136======================
180 137
181Languages are not equally supported in all packages. The following 138Languages are not equally supported in all packages. The following
182matrix shows the current state of internationalization, as of October 139matrix shows the current state of internationalization, as of June
1832006. The matrix shows, in regard of each package, for which languages 1402010. The matrix shows, in regard of each package, for which languages
184PO files have been submitted to translation coordination, with a 141PO files have been submitted to translation coordination, with a
185translation percentage of at least 50%. 142translation percentage of at least 50%.
186 143
187 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
188 +----------------------------------------------------+
189 GNUnet | [] |
190 a2ps | [] [] [] [] [] |
191 aegis | () |
192 ant-phone | () |
193 anubis | [] |
194 ap-utils | |
195 aspell | [] [] [] [] [] |
196 bash | [] [] [] |
197 batchelor | [] |
198 bfd | |
199 bibshelf | [] |
200 binutils | [] |
201 bison | [] [] |
202 bison-runtime | |
203 bluez-pin | [] [] [] [] [] |
204 cflow | [] |
205 clisp | [] [] |
206 console-tools | [] [] |
207 coreutils | [] [] [] |
208 cpio | |
209 cpplib | [] [] [] |
210 cryptonit | [] |
211 darkstat | [] () [] |
212 dialog | [] [] [] [] [] [] |
213 diffutils | [] [] [] [] [] [] |
214 doodle | [] |
215 e2fsprogs | [] [] |
216 enscript | [] [] [] [] |
217 error | [] [] [] [] |
218 fetchmail | [] [] () [] |
219 fileutils | [] [] |
220 findutils | [] [] [] |
221 flex | [] [] [] |
222 fslint | [] |
223 gas | |
224 gawk | [] [] [] |
225 gbiff | [] |
226 gcal | [] |
227 gcc | [] |
228 gettext-examples | [] [] [] [] [] |
229 gettext-runtime | [] [] [] [] [] |
230 gettext-tools | [] [] |
231 gimp-print | [] [] [] [] |
232 gip | [] |
233 gliv | [] |
234 glunarclock | [] |
235 gmult | [] [] |
236 gnubiff | () |
237 gnucash | () () [] |
238 gnucash-glossary | [] () |
239 gnuedu | |
240 gnulib | [] [] [] [] [] [] |
241 gnunet-gtk | |
242 gnutls | |
243 gpe-aerial | [] [] |
244 gpe-beam | [] [] |
245 gpe-calendar | |
246 gpe-clock | [] [] |
247 gpe-conf | [] [] |
248 gpe-contacts | |
249 gpe-edit | [] |
250 gpe-filemanager | |
251 gpe-go | [] |
252 gpe-login | [] [] |
253 gpe-ownerinfo | [] [] |
254 gpe-package | |
255 gpe-sketchbook | [] [] |
256 gpe-su | [] [] |
257 gpe-taskmanager | [] [] |
258 gpe-timesheet | [] |
259 gpe-today | [] [] |
260 gpe-todo | |
261 gphoto2 | [] [] [] [] |
262 gprof | [] [] |
263 gpsdrive | () () |
264 gramadoir | [] [] |
265 grep | [] [] [] [] [] [] |
266 gretl | |
267 gsasl | |
268 gss | |
269 gst-plugins | [] [] [] [] |
270 gst-plugins-base | [] [] [] |
271 gst-plugins-good | [] [] [] [] [] [] [] |
272 gstreamer | [] [] [] [] [] [] [] |
273 gtick | () |
274 gtkam | [] [] [] |
275 gtkorphan | [] [] |
276 gtkspell | [] [] [] [] |
277 gutenprint | [] |
278 hello | [] [] [] [] [] |
279 id-utils | [] [] |
280 impost | |
281 indent | [] [] [] |
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 lynx | [] [] [] [] |
310 m4 | [] [] [] [] |
311 mailutils | [] |
312 make | [] [] |
313 man-db | [] () [] [] |
314 minicom | [] [] [] |
315 mysecretdiary | [] [] |
316 nano | [] [] [] |
317 nano_1_0 | [] () [] [] |
318 opcodes | [] |
319 parted | |
320 pilot-qof | [] |
321 psmisc | [] |
322 pwdutils | |
323 python | |
324 qof | |
325 radius | [] |
326 recode | [] [] [] [] [] [] |
327 rpm | [] [] |
328 screem | |
329 scrollkeeper | [] [] [] [] [] [] [] [] |
330 sed | [] [] [] |
331 sh-utils | [] [] |
332 shared-mime-info | [] [] [] [] |
333 sharutils | [] [] [] [] [] [] |
334 shishi | |
335 silky | |
336 skencil | [] () |
337 sketch | [] () |
338 solfege | |
339 soundtracker | [] [] |
340 sp | [] |
341 stardict | [] |
342 system-tools-ba... | [] [] [] [] [] [] [] [] [] |
343 tar | [] |
344 texinfo | [] [] [] |
345 textutils | [] [] [] |
346 tin | () () |
347 tp-robot | [] |
348 tuxpaint | [] [] [] [] [] |
349 unicode-han-tra... | |
350 unicode-transla... | |
351 util-linux | [] [] [] [] |
352 vorbis-tools | [] [] [] [] |
353 wastesedge | () |
354 wdiff | [] [] [] [] |
355 wget | [] [] |
356 xchat | [] [] [] [] [] [] |
357 xkeyboard-config | |
358 xpad | [] [] |
359 +----------------------------------------------------+
360 af am ar az be bg bs ca cs cy da de el en en_GB eo
361 10 0 1 2 9 22 1 42 41 2 60 95 16 1 17 16
362
363 es et eu fa fi fr ga gl gu he hi hr hu id is it
364 +--------------------------------------------------+ 145 +--------------------------------------------------+
365 GNUnet | | 146 a2ps | [] [] |
366 a2ps | [] [] [] () |
367 aegis | | 147 aegis | |
368 ant-phone | [] | 148 ant-phone | |
369 anubis | [] | 149 anubis | |
370 ap-utils | [] [] | 150 aspell | [] [] |
371 aspell | [] [] [] | 151 bash | |
372 bash | [] [] [] | 152 bfd | |
373 batchelor | [] [] | 153 bibshelf | [] |
374 bfd | [] | 154 binutils | |
375 bibshelf | [] [] [] | 155 bison | |
376 binutils | [] [] [] | 156 bison-runtime | [] |
377 bison | [] [] [] [] [] [] | 157 bluez-pin | [] [] |
378 bison-runtime | [] [] [] [] [] | 158 bombono-dvd | |
379 bluez-pin | [] [] [] [] [] | 159 buzztard | |
380 cflow | [] | 160 cflow | |
381 clisp | [] [] | 161 clisp | |
382 console-tools | | 162 coreutils | [] [] |
383 coreutils | [] [] [] [] [] [] | 163 cpio | |
384 cpio | [] [] [] | 164 cppi | |
385 cpplib | [] [] | 165 cpplib | [] |
386 cryptonit | [] | 166 cryptsetup | |
387 darkstat | [] () [] [] [] | 167 dfarc | |
388 dialog | [] [] [] [] [] [] [] [] | 168 dialog | [] [] |
389 diffutils | [] [] [] [] [] [] [] [] [] | 169 dico | |
390 doodle | [] [] | 170 diffutils | [] |
391 e2fsprogs | [] [] [] | 171 dink | |
392 enscript | [] [] [] | 172 doodle | |
393 error | [] [] [] [] [] | 173 e2fsprogs | [] |
394 fetchmail | [] | 174 enscript | [] |
395 fileutils | [] [] [] [] [] [] | 175 exif | |
396 findutils | [] [] [] [] | 176 fetchmail | [] |
397 flex | [] [] [] | 177 findutils | [] |
398 fslint | [] | 178 flex | [] |
399 gas | [] [] | 179 freedink | |
400 gawk | [] [] [] [] | 180 gas | |
401 gbiff | [] | 181 gawk | [] [] |
402 gcal | [] [] | 182 gcal | [] |
403 gcc | [] | 183 gcc | |
404 gettext-examples | [] [] [] [] [] [] | 184 gettext-examples | [] [] [] [] |
405 gettext-runtime | [] [] [] [] [] [] | 185 gettext-runtime | [] [] |
406 gettext-tools | [] [] [] | 186 gettext-tools | [] [] |
407 gimp-print | [] [] | 187 gip | [] |
408 gip | [] [] [] | 188 gjay | |
409 gliv | () | 189 gliv | [] |
410 glunarclock | [] [] [] | 190 glunarclock | [] [] |
411 gmult | [] [] [] | 191 gnubiff | |
412 gnubiff | () () | 192 gnucash | [] |
413 gnucash | () () () | 193 gnuedu | |
414 gnucash-glossary | [] [] | 194 gnulib | |
415 gnuedu | [] | 195 gnunet | |
416 gnulib | [] [] [] [] [] [] [] [] |
417 gnunet-gtk | | 196 gnunet-gtk | |
418 gnutls | | 197 gnutls | |
419 gpe-aerial | [] [] | 198 gold | |
420 gpe-beam | [] [] | 199 gpe-aerial | |
200 gpe-beam | |
201 gpe-bluetooth | |
421 gpe-calendar | | 202 gpe-calendar | |
422 gpe-clock | [] [] [] [] | 203 gpe-clock | [] |
423 gpe-conf | [] | 204 gpe-conf | |
424 gpe-contacts | [] [] | 205 gpe-contacts | |
425 gpe-edit | [] [] [] [] | 206 gpe-edit | |
426 gpe-filemanager | [] | 207 gpe-filemanager | |
427 gpe-go | [] [] [] | 208 gpe-go | |
428 gpe-login | [] [] [] | 209 gpe-login | |
429 gpe-ownerinfo | [] [] [] [] [] | 210 gpe-ownerinfo | [] |
430 gpe-package | [] | 211 gpe-package | |
431 gpe-sketchbook | [] [] | 212 gpe-sketchbook | |
432 gpe-su | [] [] [] [] | 213 gpe-su | [] |
433 gpe-taskmanager | [] [] [] | 214 gpe-taskmanager | [] |
434 gpe-timesheet | [] [] [] [] | 215 gpe-timesheet | [] |
435 gpe-today | [] [] [] [] | 216 gpe-today | [] |
436 gpe-todo | [] | 217 gpe-todo | |
437 gphoto2 | [] [] [] [] [] | 218 gphoto2 | |
438 gprof | [] [] [] [] | 219 gprof | [] |
439 gpsdrive | () () [] () | 220 gpsdrive | |
440 gramadoir | [] [] | 221 gramadoir | |
441 grep | [] [] [] [] [] [] [] [] [] [] [] [] | 222 grep | |
442 gretl | [] [] [] | 223 grub | [] [] |
443 gsasl | [] [] | 224 gsasl | |
444 gss | [] | 225 gss | |
445 gst-plugins | [] [] [] | 226 gst-plugins-bad | [] |
446 gst-plugins-base | [] [] | 227 gst-plugins-base | [] |
447 gst-plugins-good | [] [] [] | 228 gst-plugins-good | [] |
448 gstreamer | [] [] [] | 229 gst-plugins-ugly | [] |
449 gtick | [] | 230 gstreamer | [] [] [] |
450 gtkam | [] [] [] [] | 231 gtick | |
451 gtkorphan | [] [] | 232 gtkam | [] |
452 gtkspell | [] [] [] [] [] [] | 233 gtkorphan | [] |
453 gutenprint | [] | 234 gtkspell | [] [] [] |
454 hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | 235 gutenprint | |
455 id-utils | [] [] [] [] [] | 236 hello | [] |
456 impost | [] [] | 237 help2man | |
457 indent | [] [] [] [] [] [] [] [] [] [] | 238 hylafax | |
458 iso_3166 | [] [] [] | 239 idutils | |
459 iso_3166_2 | [] | 240 indent | [] [] |
460 iso_4217 | [] [] [] [] | 241 iso_15924 | |
461 iso_639 | [] [] [] [] [] | 242 iso_3166 | [] [] [] [] [] [] [] |
462 jpilot | [] [] | 243 iso_3166_2 | |
463 jtag | [] | 244 iso_4217 | |
464 jwhois | [] [] [] [] [] | 245 iso_639 | [] [] [] [] |
465 kbd | [] [] | 246 iso_639_3 | |
466 keytouch | [] | 247 jwhois | |
467 keytouch-editor | [] | 248 kbd | |
468 keytouch-keyboa... | [] | 249 keytouch | [] |
469 latrine | [] [] [] | 250 keytouch-editor | |
470 ld | [] [] | 251 keytouch-keyboa... | [] |
471 leafpad | [] [] [] [] [] [] | 252 klavaro | [] |
472 libc | [] [] [] [] [] | 253 latrine | |
473 libexif | [] | 254 ld | [] |
474 libextractor | [] | 255 leafpad | [] [] |
475 libgpewidget | [] [] [] [] [] | 256 libc | [] [] |
257 libexif | () |
258 libextractor | |
259 libgnutls | |
260 libgpewidget | |
476 libgpg-error | | 261 libgpg-error | |
477 libgphoto2 | [] [] [] | 262 libgphoto2 | |
478 libgphoto2_port | [] [] | 263 libgphoto2_port | |
479 libgsasl | [] [] | 264 libgsasl | |
480 libiconv | [] [] | 265 libiconv | [] |
481 libidn | [] [] | 266 libidn | |
482 lifelines | () | 267 lifelines | |
483 lilypond | [] | 268 liferea | [] [] |
484 lingoteach | [] [] [] | 269 lilypond | |
485 lynx | [] [] [] | 270 linkdr | [] |
486 m4 | [] [] [] [] | 271 lordsawar | |
487 mailutils | [] [] | 272 lprng | |
488 make | [] [] [] [] [] [] [] [] | 273 lynx | [] |
489 man-db | () | 274 m4 | |
490 minicom | [] [] [] [] | 275 mailfromd | |
491 mysecretdiary | [] [] [] | 276 mailutils | |
492 nano | [] [] [] [] [] [] | 277 make | |
493 nano_1_0 | [] [] [] [] [] | 278 man-db | |
494 opcodes | [] [] [] [] | 279 man-db-manpages | |
495 parted | [] [] [] [] | 280 minicom | |
496 pilot-qof | | 281 mkisofs | |
497 psmisc | [] [] [] | 282 myserver | |
283 nano | [] [] |
284 opcodes | |
285 parted | |
286 pies | |
287 popt | |
288 psmisc | |
289 pspp | [] |
498 pwdutils | | 290 pwdutils | |
499 python | | 291 radius | [] |
500 qof | [] | 292 recode | [] [] |
501 radius | [] [] | 293 rosegarden | |
502 recode | [] [] [] [] [] [] [] [] | 294 rpm | |
503 rpm | [] [] | 295 rush | |
296 sarg | |
504 screem | | 297 screem | |
505 scrollkeeper | [] [] [] | 298 scrollkeeper | [] [] [] |
506 sed | [] [] [] [] [] | 299 sed | [] [] |
507 sh-utils | [] [] [] [] [] [] [] | 300 sharutils | [] [] |
508 shared-mime-info | [] [] [] [] [] [] |
509 sharutils | [] [] [] [] [] [] [] [] |
510 shishi | | 301 shishi | |
511 silky | [] | 302 skencil | |
512 skencil | [] [] | 303 solfege | |
513 sketch | [] [] | 304 solfege-manual | |
514 solfege | [] | 305 soundtracker | |
515 soundtracker | [] [] [] | 306 sp | |
516 sp | [] | 307 sysstat | |
517 stardict | [] | 308 tar | [] |
518 system-tools-ba... | [] [] [] [] [] [] [] [] | 309 texinfo | |
519 tar | [] [] [] [] [] [] [] | 310 tin | |
520 texinfo | [] [] |
521 textutils | [] [] [] [] [] |
522 tin | [] () |
523 tp-robot | [] [] [] [] |
524 tuxpaint | [] [] |
525 unicode-han-tra... | | 311 unicode-han-tra... | |
526 unicode-transla... | [] [] | 312 unicode-transla... | |
527 util-linux | [] [] [] [] [] [] [] | 313 util-linux-ng | [] |
528 vorbis-tools | [] [] | 314 vice | |
529 wastesedge | () | 315 vmm | |
530 wdiff | [] [] [] [] [] [] [] [] | 316 vorbis-tools | |
531 wget | [] [] [] [] [] [] [] [] | 317 wastesedge | |
532 xchat | [] [] [] [] [] [] [] [] | 318 wdiff | |
533 xkeyboard-config | [] [] [] [] | 319 wget | [] [] |
534 xpad | [] [] [] | 320 wyslij-po | |
321 xchat | [] [] [] [] |
322 xdg-user-dirs | [] [] [] [] [] [] [] [] [] |
323 xkeyboard-config | [] [] |
535 +--------------------------------------------------+ 324 +--------------------------------------------------+
536 es et eu fa fi fr ga gl gu he hi hr hu id is it 325 af am an ar as ast az be be@latin bg bn_IN bs ca
537 88 22 14 2 40 115 61 14 1 8 1 6 59 31 0 52 326 6 0 1 2 3 19 1 10 3 28 3 1 38
538 327
539 ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no 328 crh cs da de el en en_GB en_ZA eo es et eu fa
540 +-------------------------------------------------+ 329 +-------------------------------------------------+
541 GNUnet | | 330 a2ps | [] [] [] [] [] [] [] |
542 a2ps | () [] [] () | 331 aegis | [] [] [] |
543 aegis | () | 332 ant-phone | [] () |
544 ant-phone | [] | 333 anubis | [] [] |
545 anubis | [] [] [] | 334 aspell | [] [] [] [] [] |
546 ap-utils | [] | 335 bash | [] [] [] |
547 aspell | [] [] | 336 bfd | [] |
548 bash | [] | 337 bibshelf | [] [] [] |
549 batchelor | [] [] | 338 binutils | [] |
550 bfd | | 339 bison | [] [] |
551 bibshelf | [] | 340 bison-runtime | [] [] [] [] |
552 binutils | | 341 bluez-pin | [] [] [] [] [] [] |
553 bison | [] [] [] | 342 bombono-dvd | [] |
554 bison-runtime | [] [] [] | 343 buzztard | [] [] [] |
555 bluez-pin | [] [] [] | 344 cflow | [] [] |
556 cflow | | 345 clisp | [] [] [] [] |
557 clisp | [] | 346 coreutils | [] [] [] [] |
558 console-tools | |
559 coreutils | [] |
560 cpio | | 347 cpio | |
561 cpplib | [] | 348 cppi | |
562 cryptonit | [] | 349 cpplib | [] [] [] |
563 darkstat | [] [] | 350 cryptsetup | [] |
564 dialog | [] [] | 351 dfarc | [] [] [] |
565 diffutils | [] [] [] | 352 dialog | [] [] [] [] [] |
566 doodle | | 353 dico | |
567 e2fsprogs | [] | 354 diffutils | [] [] [] [] [] [] |
568 enscript | [] | 355 dink | [] [] [] |
569 error | [] | 356 doodle | [] |
570 fetchmail | [] [] | 357 e2fsprogs | [] [] [] |
571 fileutils | [] [] | 358 enscript | [] [] [] |
572 findutils | [] | 359 exif | () [] [] |
573 flex | [] [] | 360 fetchmail | [] [] () [] [] [] |
574 fslint | [] [] | 361 findutils | [] [] [] |
575 gas | | 362 flex | [] [] |
576 gawk | [] [] | 363 freedink | [] [] [] |
577 gbiff | [] | 364 gas | [] |
578 gcal | | 365 gawk | [] [] [] |
579 gcc | | 366 gcal | [] |
580 gettext-examples | [] [] | 367 gcc | [] [] |
581 gettext-runtime | [] [] [] | 368 gettext-examples | [] [] [] [] |
582 gettext-tools | [] [] | 369 gettext-runtime | [] [] [] [] |
583 gimp-print | [] [] | 370 gettext-tools | [] [] [] |
584 gip | [] [] | 371 gip | [] [] [] [] |
585 gliv | [] | 372 gjay | [] |
586 glunarclock | [] [] | 373 gliv | [] [] [] |
587 gmult | [] [] | 374 glunarclock | [] [] |
588 gnubiff | | 375 gnubiff | () |
589 gnucash | () () | 376 gnucash | [] () () () () |
590 gnucash-glossary | [] | 377 gnuedu | [] [] |
591 gnuedu | | 378 gnulib | [] [] |
592 gnulib | [] [] [] [] | 379 gnunet | |
593 gnunet-gtk | | 380 gnunet-gtk | [] |
594 gnutls | | 381 gnutls | [] [] |
595 gpe-aerial | [] | 382 gold | [] |
596 gpe-beam | [] | 383 gpe-aerial | [] [] [] [] |
597 gpe-calendar | [] | 384 gpe-beam | [] [] [] [] |
598 gpe-clock | [] [] [] | 385 gpe-bluetooth | [] [] |
599 gpe-conf | [] [] | 386 gpe-calendar | [] |
600 gpe-contacts | [] | 387 gpe-clock | [] [] [] [] |
601 gpe-edit | [] [] [] | 388 gpe-conf | [] [] [] |
602 gpe-filemanager | [] [] | 389 gpe-contacts | [] [] [] |
603 gpe-go | [] [] [] | 390 gpe-edit | [] [] |
604 gpe-login | [] [] [] | 391 gpe-filemanager | [] [] [] |
605 gpe-ownerinfo | [] [] | 392 gpe-go | [] [] [] [] |
606 gpe-package | [] [] | 393 gpe-login | [] [] |
607 gpe-sketchbook | [] [] | 394 gpe-ownerinfo | [] [] [] [] |
608 gpe-su | [] [] [] | 395 gpe-package | [] [] [] |
609 gpe-taskmanager | [] [] [] [] | 396 gpe-sketchbook | [] [] [] [] |
610 gpe-timesheet | [] | 397 gpe-su | [] [] [] [] |
611 gpe-today | [] [] | 398 gpe-taskmanager | [] [] [] [] |
612 gpe-todo | [] | 399 gpe-timesheet | [] [] [] [] |
613 gphoto2 | [] [] | 400 gpe-today | [] [] [] [] |
614 gprof | | 401 gpe-todo | [] [] [] |
615 gpsdrive | () () () | 402 gphoto2 | [] [] () [] [] [] |
616 gramadoir | () | 403 gprof | [] [] [] |
617 grep | [] [] [] [] | 404 gpsdrive | [] [] [] |
618 gretl | | 405 gramadoir | [] [] [] |
619 gsasl | [] | 406 grep | [] |
407 grub | [] [] |
408 gsasl | [] |
620 gss | | 409 gss | |
621 gst-plugins | [] | 410 gst-plugins-bad | [] [] [] [] [] |
622 gst-plugins-base | | 411 gst-plugins-base | [] [] [] [] [] |
623 gst-plugins-good | [] | 412 gst-plugins-good | [] [] [] [] [] [] |
624 gstreamer | [] | 413 gst-plugins-ugly | [] [] [] [] [] [] |
625 gtick | | 414 gstreamer | [] [] [] [] [] |
626 gtkam | [] | 415 gtick | [] () [] |
627 gtkorphan | [] | 416 gtkam | [] [] () [] [] |
628 gtkspell | [] [] | 417 gtkorphan | [] [] [] [] |
629 gutenprint | | 418 gtkspell | [] [] [] [] [] [] [] |
630 hello | [] [] [] [] [] [] | 419 gutenprint | [] [] [] |
631 id-utils | [] | 420 hello | [] [] [] [] |
632 impost | | 421 help2man | [] |
633 indent | [] [] | 422 hylafax | [] [] |
634 iso_3166 | [] | 423 idutils | [] [] |
635 iso_3166_2 | [] | 424 indent | [] [] [] [] [] [] [] |
636 iso_4217 | [] [] [] | 425 iso_15924 | [] () [] [] |
637 iso_639 | [] [] | 426 iso_3166 | [] [] [] [] () [] [] [] () |
638 jpilot | () () () | 427 iso_3166_2 | () |
639 jtag | | 428 iso_4217 | [] [] [] () [] [] |
640 jwhois | [] | 429 iso_639 | [] [] [] [] () [] [] |
641 kbd | [] | 430 iso_639_3 | [] |
642 keytouch | [] | 431 jwhois | [] |
643 keytouch-editor | | 432 kbd | [] [] [] [] [] |
644 keytouch-keyboa... | | 433 keytouch | [] [] |
645 latrine | [] | 434 keytouch-editor | [] [] |
646 ld | | 435 keytouch-keyboa... | [] |
647 leafpad | [] [] | 436 klavaro | [] [] [] [] |
648 libc | [] [] [] [] [] | 437 latrine | [] () |
649 libexif | | 438 ld | [] [] |
439 leafpad | [] [] [] [] [] [] |
440 libc | [] [] [] [] |
441 libexif | [] [] () |
650 libextractor | | 442 libextractor | |
651 libgpewidget | [] | 443 libgnutls | [] |
652 libgpg-error | | 444 libgpewidget | [] [] |
653 libgphoto2 | [] | 445 libgpg-error | [] [] |
654 libgphoto2_port | [] | 446 libgphoto2 | [] () |
655 libgsasl | [] | 447 libgphoto2_port | [] () [] |
656 libiconv | | 448 libgsasl | |
657 libidn | [] [] | 449 libiconv | [] [] [] [] [] |
658 lifelines | [] | 450 libidn | [] [] [] |
659 lilypond | | 451 lifelines | [] () |
660 lingoteach | [] | 452 liferea | [] [] [] [] [] |
661 lynx | [] [] | 453 lilypond | [] [] [] |
662 m4 | [] [] | 454 linkdr | [] [] [] |
663 mailutils | | 455 lordsawar | [] |
664 make | [] [] [] | 456 lprng | |
665 man-db | () | 457 lynx | [] [] [] [] |
666 minicom | [] | 458 m4 | [] [] [] [] |
667 mysecretdiary | [] | 459 mailfromd | |
668 nano | [] [] [] | 460 mailutils | [] |
669 nano_1_0 | [] [] [] | 461 make | [] [] [] |
670 opcodes | [] | 462 man-db | |
671 parted | [] [] | 463 man-db-manpages | |
672 pilot-qof | | 464 minicom | [] [] [] [] |
673 psmisc | [] [] [] | 465 mkisofs | |
674 pwdutils | | 466 myserver | |
675 python | | 467 nano | [] [] [] |
676 qof | | 468 opcodes | [] [] |
677 radius | | 469 parted | [] [] |
678 recode | [] | 470 pies | |
679 rpm | [] [] | 471 popt | [] [] [] [] [] |
680 screem | [] | 472 psmisc | [] [] [] |
681 scrollkeeper | [] [] [] [] | 473 pspp | [] |
682 sed | [] [] | 474 pwdutils | [] |
683 sh-utils | [] [] | 475 radius | [] |
684 shared-mime-info | [] [] [] [] [] | 476 recode | [] [] [] [] [] [] |
685 sharutils | [] [] | 477 rosegarden | () () () |
478 rpm | [] [] [] |
479 rush | |
480 sarg | |
481 screem | |
482 scrollkeeper | [] [] [] [] [] |
483 sed | [] [] [] [] [] [] |
484 sharutils | [] [] [] [] |
686 shishi | | 485 shishi | |
687 silky | [] | 486 skencil | [] () [] |
688 skencil | | 487 solfege | [] [] [] |
689 sketch | | 488 solfege-manual | [] [] |
690 solfege | | 489 soundtracker | [] [] [] |
691 soundtracker | | 490 sp | [] |
692 sp | () | 491 sysstat | [] [] [] |
693 stardict | [] [] | 492 tar | [] [] [] [] |
694 system-tools-ba... | [] [] [] [] | 493 texinfo | [] [] [] |
695 tar | [] [] [] | 494 tin | [] [] |
696 texinfo | [] [] [] |
697 textutils | [] [] [] |
698 tin | |
699 tp-robot | [] |
700 tuxpaint | [] |
701 unicode-han-tra... | | 495 unicode-han-tra... | |
702 unicode-transla... | | 496 unicode-transla... | |
703 util-linux | [] [] | 497 util-linux-ng | [] [] [] [] |
704 vorbis-tools | [] | 498 vice | () () |
705 wastesedge | [] | 499 vmm | [] |
706 wdiff | [] [] | 500 vorbis-tools | [] [] |
707 wget | [] [] | 501 wastesedge | [] |
708 xchat | [] [] [] [] | 502 wdiff | [] [] |
709 xkeyboard-config | [] | 503 wget | [] [] [] |
710 xpad | [] [] [] | 504 wyslij-po | |
505 xchat | [] [] [] [] [] |
506 xdg-user-dirs | [] [] [] [] [] [] [] [] [] |
507 xkeyboard-config | [] [] [] [] [] [] |
711 +-------------------------------------------------+ 508 +-------------------------------------------------+
712 ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no 509 crh cs da de el en en_GB en_ZA eo es et eu fa
713 52 24 2 2 1 3 0 2 3 21 0 15 1 97 5 1 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
714 879
715 nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta 880 nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr
716 +------------------------------------------------------+ 881 +---------------------------------------------------+
717 GNUnet | | 882 a2ps | [] [] [] [] [] [] [] [] |
718 a2ps | () [] [] [] [] [] [] | 883 aegis | [] [] [] |
719 aegis | () () | 884 ant-phone | [] [] |
720 ant-phone | [] [] | 885 anubis | [] [] [] |
721 anubis | [] [] [] | 886 aspell | [] [] [] [] [] |
722 ap-utils | () | 887 bash | [] [] |
723 aspell | [] [] | 888 bfd | [] |
724 bash | [] [] [] | 889 bibshelf | [] [] |
725 batchelor | [] [] | 890 binutils | [] [] |
726 bfd | | 891 bison | [] [] [] |
727 bibshelf | [] | 892 bison-runtime | [] [] [] [] [] [] [] |
728 binutils | [] [] | 893 bluez-pin | [] [] [] [] [] [] [] [] |
729 bison | [] [] [] [] [] | 894 bombono-dvd | [] () |
730 bison-runtime | [] [] [] [] | 895 buzztard | [] [] |
731 bluez-pin | [] [] [] [] [] [] [] [] [] | 896 cflow | [] |
732 cflow | [] | 897 clisp | [] [] |
733 clisp | [] | 898 coreutils | [] [] [] [] [] [] |
734 console-tools | [] | 899 cpio | [] [] [] |
735 coreutils | [] [] [] [] | 900 cppi | [] |
736 cpio | [] [] [] | 901 cpplib | [] |
737 cpplib | [] | 902 cryptsetup | [] |
738 cryptonit | [] [] | 903 dfarc | [] |
739 darkstat | [] [] [] [] [] [] | 904 dialog | [] [] [] [] |
740 dialog | [] [] [] [] [] [] [] [] [] | 905 dico | [] |
741 diffutils | [] [] [] [] [] [] | 906 diffutils | [] [] [] [] [] [] |
742 doodle | [] [] | 907 dink | () |
743 e2fsprogs | [] [] | 908 doodle | [] [] |
744 enscript | [] [] [] [] [] | 909 e2fsprogs | [] [] |
745 error | [] [] [] [] | 910 enscript | [] [] [] [] [] |
746 fetchmail | [] [] [] | 911 exif | [] [] [] () [] |
747 fileutils | [] [] [] [] [] | 912 fetchmail | [] [] [] [] |
748 findutils | [] [] [] [] [] [] | 913 findutils | [] [] [] [] [] |
749 flex | [] [] [] [] [] | 914 flex | [] [] [] [] [] |
750 fslint | [] [] [] [] | 915 freedink | [] [] |
751 gas | | 916 gas | |
752 gawk | [] [] [] [] | 917 gawk | [] [] [] [] |
753 gbiff | [] | 918 gcal | |
754 gcal | [] | 919 gcc | [] |
755 gcc | [] | 920 gettext-examples | [] [] [] [] [] [] [] [] |
756 gettext-examples | [] [] [] [] [] [] [] [] | 921 gettext-runtime | [] [] [] [] [] [] [] [] [] |
757 gettext-runtime | [] [] [] [] [] [] [] [] | 922 gettext-tools | [] [] [] [] [] [] |
758 gettext-tools | [] [] [] [] [] [] [] | 923 gip | [] [] [] [] [] |
759 gimp-print | [] [] | 924 gjay | |
760 gip | [] [] [] [] | 925 gliv | [] [] [] [] [] [] |
761 gliv | [] [] [] [] | 926 glunarclock | [] [] [] [] [] |
762 glunarclock | [] [] [] [] [] [] | 927 gnubiff | [] () |
763 gmult | [] [] [] [] | 928 gnucash | [] () () () |
764 gnubiff | () | 929 gnuedu | [] |
765 gnucash | () [] | 930 gnulib | [] [] [] [] |
766 gnucash-glossary | [] [] [] | 931 gnunet | |
767 gnuedu | | 932 gnunet-gtk | |
768 gnulib | [] [] [] [] [] | 933 gnutls | [] [] |
769 gnunet-gtk | [] | 934 gold | |
770 gnutls | [] [] | 935 gpe-aerial | [] [] [] [] [] [] [] |
771 gpe-aerial | [] [] [] [] [] [] [] | 936 gpe-beam | [] [] [] [] [] [] [] |
772 gpe-beam | [] [] [] [] [] [] [] | 937 gpe-bluetooth | [] [] |
773 gpe-calendar | [] | 938 gpe-calendar | [] [] [] [] |
774 gpe-clock | [] [] [] [] [] [] [] [] | 939 gpe-clock | [] [] [] [] [] [] [] [] |
775 gpe-conf | [] [] [] [] [] [] [] | 940 gpe-conf | [] [] [] [] [] [] [] |
776 gpe-contacts | [] [] [] [] [] | 941 gpe-contacts | [] [] [] [] [] |
777 gpe-edit | [] [] [] [] [] [] [] [] | 942 gpe-edit | [] [] [] |
778 gpe-filemanager | [] [] | 943 gpe-filemanager | [] [] [] |
779 gpe-go | [] [] [] [] [] [] | 944 gpe-go | [] [] [] [] [] [] [] [] |
780 gpe-login | [] [] [] [] [] [] [] [] | 945 gpe-login | [] [] |
781 gpe-ownerinfo | [] [] [] [] [] [] [] [] | 946 gpe-ownerinfo | [] [] [] [] [] [] [] [] |
782 gpe-package | [] [] | 947 gpe-package | [] [] |
783 gpe-sketchbook | [] [] [] [] [] [] [] [] | 948 gpe-sketchbook | [] [] [] [] [] [] [] |
784 gpe-su | [] [] [] [] [] [] [] [] | 949 gpe-su | [] [] [] [] [] [] [] [] |
785 gpe-taskmanager | [] [] [] [] [] [] [] [] | 950 gpe-taskmanager | [] [] [] [] [] [] [] [] |
786 gpe-timesheet | [] [] [] [] [] [] [] [] | 951 gpe-timesheet | [] [] [] [] [] [] [] [] |
787 gpe-today | [] [] [] [] [] [] [] [] | 952 gpe-today | [] [] [] [] [] [] [] [] |
788 gpe-todo | [] [] [] [] | 953 gpe-todo | [] [] [] [] [] |
789 gphoto2 | [] [] [] [] [] | 954 gphoto2 | [] [] [] [] [] [] [] [] |
790 gprof | [] [] [] | 955 gprof | [] [] [] |
791 gpsdrive | [] [] [] | 956 gpsdrive | [] [] |
792 gramadoir | [] [] | 957 gramadoir | [] [] |
793 grep | [] [] [] [] [] [] [] [] | 958 grep | [] [] [] [] |
794 gretl | [] | 959 grub | [] [] [] |
795 gsasl | [] [] [] | 960 gsasl | [] [] [] [] |
796 gss | [] [] [] | 961 gss | [] [] [] |
797 gst-plugins | [] [] [] [] | 962 gst-plugins-bad | [] [] [] [] [] [] |
798 gst-plugins-base | [] | 963 gst-plugins-base | [] [] [] [] [] |
799 gst-plugins-good | [] [] [] [] | 964 gst-plugins-good | [] [] [] [] [] |
800 gstreamer | [] [] [] | 965 gst-plugins-ugly | [] [] [] [] [] [] |
801 gtick | [] | 966 gstreamer | [] [] [] [] [] |
802 gtkam | [] [] [] [] | 967 gtick | [] [] [] |
803 gtkorphan | [] | 968 gtkam | [] [] [] [] [] [] |
804 gtkspell | [] [] [] [] [] [] [] [] | 969 gtkorphan | [] |
805 gutenprint | [] | 970 gtkspell | [] [] [] [] [] [] [] [] [] [] |
806 hello | [] [] [] [] [] [] [] [] | 971 gutenprint | [] [] |
807 id-utils | [] [] [] [] | 972 hello | [] [] [] [] |
808 impost | [] | 973 help2man | [] [] |
809 indent | [] [] [] [] [] [] | 974 hylafax | [] |
810 iso_3166 | [] [] [] [] [] [] | 975 idutils | [] [] [] [] [] |
811 iso_3166_2 | | 976 indent | [] [] [] [] [] [] [] |
812 iso_4217 | [] [] [] [] | 977 iso_15924 | [] [] [] [] |
813 iso_639 | [] [] [] [] | 978 iso_3166 | [] [] [] [] [] () [] [] [] [] [] [] [] [] |
814 jpilot | | 979 iso_3166_2 | [] [] [] |
815 jtag | [] | 980 iso_4217 | [] [] [] [] [] [] [] [] |
816 jwhois | [] [] [] [] | 981 iso_639 | [] [] [] [] [] [] [] [] [] |
817 kbd | [] [] [] | 982 iso_639_3 | [] [] |
818 keytouch | [] | 983 jwhois | [] [] [] [] |
819 keytouch-editor | [] | 984 kbd | [] [] [] |
820 keytouch-keyboa... | [] | 985 keytouch | [] [] [] |
821 latrine | [] [] | 986 keytouch-editor | [] [] [] |
822 ld | [] | 987 keytouch-keyboa... | [] [] [] |
823 leafpad | [] [] [] [] [] [] | 988 klavaro | [] [] |
824 libc | [] [] [] [] [] | 989 latrine | [] [] |
825 libexif | [] | 990 ld | |
826 libextractor | [] [] | 991 leafpad | [] [] [] [] [] [] [] [] [] |
827 libgpewidget | [] [] [] [] [] [] [] | 992 libc | [] [] [] [] |
828 libgpg-error | [] [] | 993 libexif | [] [] () [] |
829 libgphoto2 | [] | 994 libextractor | |
830 libgphoto2_port | [] [] [] | 995 libgnutls | [] [] |
831 libgsasl | [] [] [] [] | 996 libgpewidget | [] [] [] |
832 libiconv | [] [] | 997 libgpg-error | [] [] |
833 libidn | [] [] () | 998 libgphoto2 | [] [] |
834 lifelines | [] [] | 999 libgphoto2_port | [] [] [] [] [] |
835 lilypond | | 1000 libgsasl | [] [] [] [] [] |
836 lingoteach | [] | 1001 libiconv | [] [] [] [] [] |
837 lynx | [] [] [] | 1002 libidn | [] [] |
838 m4 | [] [] [] [] [] | 1003 lifelines | [] [] |
839 mailutils | [] [] [] [] | 1004 liferea | [] [] [] [] [] () () [] |
840 make | [] [] [] [] | 1005 lilypond | [] |
841 man-db | [] [] | 1006 linkdr | [] [] [] |
842 minicom | [] [] [] [] [] | 1007 lordsawar | |
843 mysecretdiary | [] [] [] [] | 1008 lprng | [] |
844 nano | [] [] [] | 1009 lynx | [] [] [] |
845 nano_1_0 | [] [] [] [] | 1010 m4 | [] [] [] [] [] |
846 opcodes | [] [] | 1011 mailfromd | [] |
847 parted | [] | 1012 mailutils | [] |
848 pilot-qof | [] | 1013 make | [] [] [] [] |
849 psmisc | [] [] | 1014 man-db | [] [] [] |
850 pwdutils | [] [] | 1015 man-db-manpages | [] [] [] |
851 python | | 1016 minicom | [] [] [] [] |
852 qof | [] [] | 1017 mkisofs | [] [] [] |
853 radius | [] [] | 1018 myserver | |
854 recode | [] [] [] [] [] [] [] | 1019 nano | [] [] [] [] |
855 rpm | [] [] [] [] | 1020 opcodes | [] [] |
856 screem | | 1021 parted | [] [] [] [] |
857 scrollkeeper | [] [] [] [] [] [] [] | 1022 pies | [] |
858 sed | [] [] [] [] [] [] [] [] [] | 1023 popt | [] [] [] [] |
859 sh-utils | [] [] [] | 1024 psmisc | [] [] [] |
860 shared-mime-info | [] [] [] [] [] | 1025 pspp | [] [] |
861 sharutils | [] [] [] [] | 1026 pwdutils | [] |
862 shishi | [] | 1027 radius | [] [] [] |
863 silky | [] | 1028 recode | [] [] [] [] [] [] [] [] |
864 skencil | [] [] [] | 1029 rosegarden | () () |
865 sketch | [] [] [] | 1030 rpm | [] [] [] |
866 solfege | [] | 1031 rush | [] [] |
867 soundtracker | [] [] | 1032 sarg | |
868 sp | | 1033 screem | |
869 stardict | [] [] [] | 1034 scrollkeeper | [] [] [] [] [] [] [] [] |
870 system-tools-ba... | [] [] [] [] [] [] [] [] [] | 1035 sed | [] [] [] [] [] [] [] [] [] |
871 tar | [] [] [] [] [] | 1036 sharutils | [] [] [] [] |
872 texinfo | [] [] [] [] | 1037 shishi | [] |
873 textutils | [] [] [] | 1038 skencil | [] [] |
874 tin | () | 1039 solfege | [] [] [] [] |
875 tp-robot | [] | 1040 solfege-manual | [] [] [] |
876 tuxpaint | [] [] [] [] [] | 1041 soundtracker | [] |
877 unicode-han-tra... | | 1042 sp | |
878 unicode-transla... | | 1043 sysstat | [] [] [] [] |
879 util-linux | [] [] [] [] | 1044 tar | [] [] [] [] |
880 vorbis-tools | [] [] | 1045 texinfo | [] [] [] [] |
881 wastesedge | | 1046 tin | [] |
882 wdiff | [] [] [] [] [] [] | 1047 unicode-han-tra... | |
883 wget | [] [] [] [] | 1048 unicode-transla... | |
884 xchat | [] [] [] [] [] [] [] | 1049 util-linux-ng | [] [] [] [] [] |
885 xkeyboard-config | [] [] | 1050 vice | [] |
886 xpad | [] [] [] | 1051 vmm | [] |
887 +------------------------------------------------------+ 1052 vorbis-tools | [] [] |
888 nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta 1053 wastesedge | [] |
889 0 2 3 58 30 54 5 73 72 4 40 46 11 50 128 2 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
890 1063
891 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
892 +---------------------------------------------------+ 1065 +---------------------------------------------------+
893 GNUnet | [] | 2 1066 a2ps | [] [] [] [] [] | 27
894 a2ps | [] [] [] | 19 1067 aegis | [] | 9
895 aegis | | 0 1068 ant-phone | [] [] [] [] | 9
896 ant-phone | [] [] | 6 1069 anubis | [] [] [] [] | 15
897 anubis | [] [] [] | 11 1070 aspell | [] [] [] | 20
898 ap-utils | () [] | 4 1071 bash | [] [] [] | 12
899 aspell | [] [] [] | 15 1072 bfd | [] | 6
900 bash | [] | 11 1073 bibshelf | [] [] [] | 16
901 batchelor | [] [] | 9 1074 binutils | [] [] | 8
902 bfd | | 1 1075 bison | [] [] | 12
903 bibshelf | [] | 7 1076 bison-runtime | [] [] [] [] [] [] | 29
904 binutils | [] [] [] | 9 1077 bluez-pin | [] [] [] [] [] [] [] [] | 37
905 bison | [] [] [] | 19 1078 bombono-dvd | [] | 4
906 bison-runtime | [] [] [] | 15 1079 buzztard | [] | 7
907 bluez-pin | [] [] [] [] [] [] | 28 1080 cflow | [] [] [] | 9
908 cflow | [] [] | 5 1081 clisp | | 10
909 clisp | | 6 1082 coreutils | [] [] [] [] | 22
910 console-tools | [] [] | 5 1083 cpio | [] [] [] [] [] [] | 13
911 coreutils | [] [] | 16 1084 cppi | [] [] | 5
912 cpio | [] [] [] | 9 1085 cpplib | [] [] [] [] [] [] | 14
913 cpplib | [] [] [] [] | 11 1086 cryptsetup | [] [] | 7
914 cryptonit | | 5 1087 dfarc | [] | 9
915 darkstat | [] () () | 15 1088 dialog | [] [] [] [] [] [] [] | 30
916 dialog | [] [] [] [] [] | 30 1089 dico | [] | 2
917 diffutils | [] [] [] [] | 28 1090 diffutils | [] [] [] [] [] [] | 30
918 doodle | [] | 6 1091 dink | | 4
919 e2fsprogs | [] [] | 10 1092 doodle | [] [] | 7
920 enscript | [] [] [] | 16 1093 e2fsprogs | [] [] [] | 11
921 error | [] [] [] [] | 18 1094 enscript | [] [] [] [] | 17
922 fetchmail | [] [] | 12 1095 exif | [] [] [] | 16
923 fileutils | [] [] [] | 18 1096 fetchmail | [] [] [] | 17
924 findutils | [] [] [] | 17 1097 findutils | [] [] [] [] [] | 20
925 flex | [] [] | 15 1098 flex | [] [] [] [] | 15
926 fslint | [] | 9 1099 freedink | [] | 10
927 gas | [] | 3 1100 gas | [] | 4
928 gawk | [] [] | 15 1101 gawk | [] [] [] [] | 18
929 gbiff | [] | 5 1102 gcal | [] [] | 5
930 gcal | [] | 5 1103 gcc | [] [] [] | 7
931 gcc | [] [] [] | 6 1104 gettext-examples | [] [] [] [] [] [] [] | 34
932 gettext-examples | [] [] [] [] [] [] | 27 1105 gettext-runtime | [] [] [] [] [] [] [] | 29
933 gettext-runtime | [] [] [] [] [] [] | 28 1106 gettext-tools | [] [] [] [] [] [] | 22
934 gettext-tools | [] [] [] [] [] | 19 1107 gip | [] [] [] [] | 22
935 gimp-print | [] [] | 12 1108 gjay | [] | 3
936 gip | [] [] | 12 1109 gliv | [] [] [] | 14
937 gliv | [] [] | 8 1110 glunarclock | [] [] [] [] [] | 19
938 glunarclock | [] [] [] | 15 1111 gnubiff | [] [] | 4
939 gmult | [] [] [] [] | 15 1112 gnucash | () [] () [] () | 10
940 gnubiff | [] | 1 1113 gnuedu | [] [] | 7
941 gnucash | () | 2 1114 gnulib | [] [] [] [] | 16
942 gnucash-glossary | [] [] | 9 1115 gnunet | [] | 1
943 gnuedu | [] | 2 1116 gnunet-gtk | [] [] [] | 5
944 gnulib | [] [] [] [] [] | 28 1117 gnutls | [] [] [] | 10
945 gnunet-gtk | | 1 1118 gold | [] | 4
946 gnutls | | 2 1119 gpe-aerial | [] [] [] | 18
947 gpe-aerial | [] [] | 14 1120 gpe-beam | [] [] [] | 19
948 gpe-beam | [] [] | 14 1121 gpe-bluetooth | [] [] [] | 13
949 gpe-calendar | [] | 3 1122 gpe-calendar | [] [] [] [] | 12
950 gpe-clock | [] [] [] [] | 21 1123 gpe-clock | [] [] [] [] [] | 28
951 gpe-conf | [] [] | 14 1124 gpe-conf | [] [] [] [] | 20
952 gpe-contacts | [] [] | 10 1125 gpe-contacts | [] [] [] | 17
953 gpe-edit | [] [] [] [] | 20 1126 gpe-edit | [] [] [] | 12
954 gpe-filemanager | [] | 6 1127 gpe-filemanager | [] [] [] [] | 16
955 gpe-go | [] [] | 15 1128 gpe-go | [] [] [] [] [] | 25
956 gpe-login | [] [] [] [] [] | 21 1129 gpe-login | [] [] [] | 11
957 gpe-ownerinfo | [] [] [] [] | 21 1130 gpe-ownerinfo | [] [] [] [] [] | 25
958 gpe-package | [] | 6 1131 gpe-package | [] [] [] | 13
959 gpe-sketchbook | [] [] | 16 1132 gpe-sketchbook | [] [] [] | 20
960 gpe-su | [] [] [] | 20 1133 gpe-su | [] [] [] [] [] | 30
961 gpe-taskmanager | [] [] [] | 20 1134 gpe-taskmanager | [] [] [] [] [] | 29
962 gpe-timesheet | [] [] [] [] | 18 1135 gpe-timesheet | [] [] [] [] [] | 25
963 gpe-today | [] [] [] [] [] | 21 1136 gpe-today | [] [] [] [] [] [] | 30
964 gpe-todo | [] | 7 1137 gpe-todo | [] [] [] [] | 17
965 gphoto2 | [] [] [] [] | 20 1138 gphoto2 | [] [] [] [] [] | 24
966 gprof | [] [] | 11 1139 gprof | [] [] [] | 15
967 gpsdrive | | 4 1140 gpsdrive | [] [] [] | 11
968 gramadoir | [] | 7 1141 gramadoir | [] [] [] | 11
969 grep | [] [] [] [] | 34 1142 grep | [] [] [] | 10
970 gretl | | 4 1143 grub | [] [] [] | 14
971 gsasl | [] [] | 8 1144 gsasl | [] [] [] [] | 14
972 gss | [] | 5 1145 gss | [] [] [] | 11
973 gst-plugins | [] [] [] | 15 1146 gst-plugins-bad | [] [] [] [] | 26
974 gst-plugins-base | [] [] [] | 9 1147 gst-plugins-base | [] [] [] [] [] | 24
975 gst-plugins-good | [] [] [] [] [] | 20 1148 gst-plugins-good | [] [] [] [] | 24
976 gstreamer | [] [] [] | 17 1149 gst-plugins-ugly | [] [] [] [] [] | 29
977 gtick | [] | 3 1150 gstreamer | [] [] [] [] | 22
978 gtkam | [] | 13 1151 gtick | [] [] [] | 13
979 gtkorphan | [] | 7 1152 gtkam | [] [] [] | 20
980 gtkspell | [] [] [] [] [] [] | 26 1153 gtkorphan | [] [] [] | 14
981 gutenprint | | 3 1154 gtkspell | [] [] [] [] [] [] [] [] [] | 45
982 hello | [] [] [] [] [] | 37 1155 gutenprint | [] | 10
983 id-utils | [] [] | 14 1156 hello | [] [] [] [] [] [] | 21
984 impost | [] | 4 1157 help2man | [] [] | 7
985 indent | [] [] [] [] | 25 1158 hylafax | [] | 5
986 iso_3166 | [] [] [] [] | 16 1159 idutils | [] [] [] [] | 17
987 iso_3166_2 | | 2 1160 indent | [] [] [] [] [] [] | 30
988 iso_4217 | [] [] | 14 1161 iso_15924 | () [] () [] [] | 16
989 iso_639 | [] | 14 1162 iso_3166 | [] [] () [] [] () [] [] [] () | 53
990 jpilot | [] [] [] [] | 7 1163 iso_3166_2 | () [] () [] | 9
991 jtag | [] | 3 1164 iso_4217 | [] () [] [] () [] [] | 26
992 jwhois | [] [] [] | 13 1165 iso_639 | [] [] [] () [] () [] [] [] [] | 38
993 kbd | [] [] | 12 1166 iso_639_3 | [] () | 8
994 keytouch | [] | 4 1167 jwhois | [] [] [] [] [] | 16
995 keytouch-editor | | 2 1168 kbd | [] [] [] [] [] | 15
996 keytouch-keyboa... | [] | 3 1169 keytouch | [] [] [] | 16
997 latrine | [] [] | 8 1170 keytouch-editor | [] [] [] | 14
998 ld | [] [] [] [] | 8 1171 keytouch-keyboa... | [] [] [] | 14
999 leafpad | [] [] [] [] | 23 1172 klavaro | [] | 11
1000 libc | [] [] [] | 23 1173 latrine | [] [] [] | 10
1001 libexif | [] | 4 1174 ld | [] [] [] [] | 11
1002 libextractor | [] | 5 1175 leafpad | [] [] [] [] [] [] | 33
1003 libgpewidget | [] [] [] | 19 1176 libc | [] [] [] [] [] | 21
1004 libgpg-error | [] | 4 1177 libexif | [] () | 7
1005 libgphoto2 | [] | 8 1178 libextractor | [] | 1
1006 libgphoto2_port | [] [] [] | 11 1179 libgnutls | [] [] [] | 9
1007 libgsasl | [] | 8 1180 libgpewidget | [] [] [] | 14
1008 libiconv | [] | 7 1181 libgpg-error | [] [] [] | 9
1009 libidn | [] [] | 10 1182 libgphoto2 | [] [] | 8
1010 lifelines | | 4 1183 libgphoto2_port | [] [] [] [] | 14
1011 lilypond | | 2 1184 libgsasl | [] [] [] | 13
1012 lingoteach | [] | 6 1185 libiconv | [] [] [] [] | 21
1013 lynx | [] [] [] | 15 1186 libidn | () [] [] | 11
1014 m4 | [] [] [] | 18 1187 lifelines | [] | 4
1015 mailutils | [] | 8 1188 liferea | [] [] [] | 21
1016 make | [] [] [] | 20 1189 lilypond | [] | 7
1017 man-db | [] | 6 1190 linkdr | [] [] [] [] [] | 17
1018 minicom | [] | 14 1191 lordsawar | | 1
1019 mysecretdiary | [] [] | 12 1192 lprng | [] | 3
1020 nano | [] [] | 17 1193 lynx | [] [] [] [] | 17
1021 nano_1_0 | [] [] [] | 18 1194 m4 | [] [] [] [] | 19
1022 opcodes | [] [] | 10 1195 mailfromd | [] [] | 3
1023 parted | [] [] [] | 10 1196 mailutils | [] | 5
1024 pilot-qof | [] | 3 1197 make | [] [] [] [] | 21
1025 psmisc | [] | 10 1198 man-db | [] [] [] | 8
1026 pwdutils | [] | 3 1199 man-db-manpages | | 4
1027 python | | 0 1200 minicom | [] [] | 16
1028 qof | [] | 4 1201 mkisofs | [] [] | 9
1029 radius | [] | 6 1202 myserver | | 0
1030 recode | [] [] [] | 25 1203 nano | [] [] [] [] | 21
1031 rpm | [] [] [] [] | 14 1204 opcodes | [] [] [] | 11
1032 screem | [] | 2 1205 parted | [] [] [] [] [] | 15
1033 scrollkeeper | [] [] [] [] | 26 1206 pies | [] [] | 3
1034 sed | [] [] [] | 22 1207 popt | [] [] [] [] [] [] | 27
1035 sh-utils | [] | 15 1208 psmisc | [] [] | 11
1036 shared-mime-info | [] [] [] [] | 24 1209 pspp | | 4
1037 sharutils | [] [] [] | 23 1210 pwdutils | [] [] | 6
1038 shishi | | 1 1211 radius | [] [] | 9
1039 silky | [] | 4 1212 recode | [] [] [] [] | 28
1040 skencil | [] | 7 1213 rosegarden | () | 0
1041 sketch | | 6 1214 rpm | [] [] [] | 11
1042 solfege | | 2 1215 rush | [] [] | 4
1043 soundtracker | [] [] | 9 1216 sarg | | 1
1044 sp | [] | 3 1217 screem | [] | 3
1045 stardict | [] [] [] [] | 11 1218 scrollkeeper | [] [] [] [] [] | 27
1046 system-tools-ba... | [] [] [] [] [] [] [] | 37 1219 sed | [] [] [] [] [] | 30
1047 tar | [] [] [] [] | 20 1220 sharutils | [] [] [] [] [] | 22
1048 texinfo | [] [] [] | 15 1221 shishi | [] | 3
1049 textutils | [] [] [] | 17 1222 skencil | [] [] | 7
1050 tin | | 1 1223 solfege | [] [] [] [] | 16
1051 tp-robot | [] [] [] | 10 1224 solfege-manual | [] | 8
1052 tuxpaint | [] [] [] | 16 1225 soundtracker | [] [] [] | 9
1226 sp | [] | 3
1227 sysstat | [] [] | 15
1228 tar | [] [] [] [] [] [] | 23
1229 texinfo | [] [] [] [] [] | 17
1230 tin | | 4
1053 unicode-han-tra... | | 0 1231 unicode-han-tra... | | 0
1054 unicode-transla... | | 2 1232 unicode-transla... | | 2
1055 util-linux | [] [] [] | 20 1233 util-linux-ng | [] [] [] [] | 20
1056 vorbis-tools | [] [] | 11 1234 vice | () () | 1
1057 wastesedge | | 1 1235 vmm | [] | 4
1058 wdiff | [] [] | 22 1236 vorbis-tools | [] | 6
1059 wget | [] [] [] | 19 1237 wastesedge | | 2
1060 xchat | [] [] [] [] | 29 1238 wdiff | [] [] | 7
1061 xkeyboard-config | [] [] [] [] | 11 1239 wget | [] [] [] [] [] | 26
1062 xpad | [] [] [] | 14 1240 wyslij-po | [] [] | 8
1241 xchat | [] [] [] [] [] [] | 36
1242 xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] | 63
1243 xkeyboard-config | [] [] [] | 22
1063 +---------------------------------------------------+ 1244 +---------------------------------------------------+
1064 77 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
1065 170 domains 0 1 1 77 39 0 136 10 1 48 5 54 0 2028 1246 178 domains 119 1 3 3 0 10 65 51 155 17 98 7 41 2618
1066 1247
1067 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
1068visible 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
@@ -1075,12 +1256,12 @@ distributed as such by its maintainer. There might be an observable
1075lag 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
1076distribution. 1257distribution.
1077 1258
1078 If October 2006 seems to be old, you may fetch a more recent copy of 1259 If June 2010 seems to be old, you may fetch a more recent copy of
1079this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date 1260this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date
1080matrix with full percentage details can be found at 1261matrix with full percentage details can be found at
1081`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. 1262`http://translationproject.org/extra/matrix.html'.
1082 1263
10831.6 Using `gettext' in new packages 12641.5 Using `gettext' in new packages
1084=================================== 1265===================================
1085 1266
1086If you are writing a freely available program and want to 1267If you are writing a freely available program and want to
@@ -1096,6 +1277,6 @@ the use of `gettext' the only thing missing are the translations. The
1096Free Translation Project is also available for packages which are not 1277Free Translation Project is also available for packages which are not
1097developed inside the GNU project. Therefore the information given above 1278developed inside the GNU project. Therefore the information given above
1098applies also for every other Free Software Project. Contact 1279applies also for every other Free Software Project. Contact
1099`translation@iro.umontreal.ca' to make the `.pot' files available to 1280`coordinator@translationproject.org' to make the `.pot' files available
1100the translation teams. 1281to the translation teams.
1101 1282
diff --git a/config.rpath b/config.rpath
index c492a93b6..b625621fa 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 b1105c1af..6495cc628 100644
--- a/configure.ac
+++ b/configure.ac
@@ -893,7 +893,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
893 893
894# check for gettext 894# check for gettext
895AM_GNU_GETTEXT([external]) 895AM_GNU_GETTEXT([external])
896AM_GNU_GETTEXT_VERSION([0.16.1]) 896AM_GNU_GETTEXT_VERSION([0.19.3])
897 897
898# check for iconv 898# check for iconv
899AM_ICONV 899AM_ICONV
diff --git a/m4/ChangeLog b/m4/ChangeLog
index e76f4b088..35a8d8971 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,12 @@
12015-05-18 gettextize <bug-gnu-gettext@gnu.org>
2
3 * iconv.m4: Upgrade to gettext-0.19.3.
4 * lib-ld.m4: Upgrade to gettext-0.19.3.
5 * lib-link.m4: Upgrade to gettext-0.19.3.
6 * lib-prefix.m4: Upgrade to gettext-0.19.3.
7 * nls.m4: Upgrade to gettext-0.19.3.
8 * progtest.m4: Upgrade to gettext-0.19.3.
9
12007-02-08 gettextize <bug-gnu-gettext@gnu.org> 102007-02-08 gettextize <bug-gnu-gettext@gnu.org>
2 11
3 * gettext.m4: Upgrade to gettext-0.16.1. 12 * gettext.m4: Upgrade to gettext-0.16.1.
diff --git a/m4/codeset.m4 b/m4/codeset.m4
index 223955b45..d7de8d67e 100644
--- a/m4/codeset.m4
+++ b/m4/codeset.m4
@@ -1,5 +1,5 @@
1# codeset.m4 serial 2 (gettext-0.16) 1# codeset.m4 serial 5 (gettext-0.18.2)
2dnl Copyright (C) 2000-2002, 2006 Free Software Foundation, Inc. 2dnl Copyright (C) 2000-2002, 2006, 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.
@@ -8,14 +8,16 @@ dnl From Bruno Haible.
8 8
9AC_DEFUN([AM_LANGINFO_CODESET], 9AC_DEFUN([AM_LANGINFO_CODESET],
10[ 10[
11 AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, 11 AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset],
12 [AC_TRY_LINK([#include <langinfo.h>], 12 [AC_LINK_IFELSE(
13 [char* cs = nl_langinfo(CODESET); return !cs;], 13 [AC_LANG_PROGRAM(
14 am_cv_langinfo_codeset=yes, 14 [[#include <langinfo.h>]],
15 am_cv_langinfo_codeset=no) 15 [[char* cs = nl_langinfo(CODESET); return !cs;]])],
16 [am_cv_langinfo_codeset=yes],
17 [am_cv_langinfo_codeset=no])
16 ]) 18 ])
17 if test $am_cv_langinfo_codeset = yes; then 19 if test $am_cv_langinfo_codeset = yes; then
18 AC_DEFINE(HAVE_LANGINFO_CODESET, 1, 20 AC_DEFINE([HAVE_LANGINFO_CODESET], [1],
19 [Define if you have <langinfo.h> and nl_langinfo(CODESET).]) 21 [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
20 fi 22 fi
21]) 23])
diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4
new file mode 100644
index 000000000..7f1bb397c
--- /dev/null
+++ b/m4/extern-inline.m4
@@ -0,0 +1,99 @@
1dnl 'extern inline' a la ISO C99.
2
3dnl Copyright 2012-2014 Free Software Foundation, Inc.
4dnl This file is free software; the Free Software Foundation
5dnl gives unlimited permission to copy and/or distribute it,
6dnl with or without modifications, as long as this notice is preserved.
7
8AC_DEFUN([gl_EXTERN_INLINE],
9[
10 AH_VERBATIM([extern_inline],
11[/* Please see the Gnulib manual for how to use these macros.
12
13 Suppress extern inline with HP-UX cc, as it appears to be broken; see
14 <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>.
15
16 Suppress extern inline with Sun C in standards-conformance mode, as it
17 mishandles inline functions that call each other. E.g., for 'inline void f
18 (void) { } inline void g (void) { f (); }', c99 incorrectly complains
19 'reference to static identifier "f" in extern inline function'.
20 This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16.
21
22 Suppress extern inline (with or without __attribute__ ((__gnu_inline__)))
23 on configurations that mistakenly use 'static inline' to implement
24 functions or macros in standard C headers like <ctype.h>. For example,
25 if isdigit is mistakenly implemented via a static inline function,
26 a program containing an extern inline function that calls isdigit
27 may not work since the C standard prohibits extern inline functions
28 from calling static functions. This bug is known to occur on:
29
30 OS X 10.8 and earlier; see:
31 http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html
32
33 DragonFly; see
34 http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log
35
36 FreeBSD; see:
37 http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html
38
39 OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and
40 for clang but remains for g++; see <http://trac.macports.org/ticket/41033>.
41 Assume DragonFly and FreeBSD will be similar. */
42#if (((defined __APPLE__ && defined __MACH__) \
43 || defined __DragonFly__ || defined __FreeBSD__) \
44 && (defined __header_inline \
45 ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \
46 && ! defined __clang__) \
47 : ((! defined _DONT_USE_CTYPE_INLINE_ \
48 && (defined __GNUC__ || defined __cplusplus)) \
49 || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \
50 && defined __GNUC__ && ! defined __cplusplus))))
51# define _GL_EXTERN_INLINE_STDHEADER_BUG
52#endif
53#if ((__GNUC__ \
54 ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
55 : (199901L <= __STDC_VERSION__ \
56 && !defined __HP_cc \
57 && !(defined __SUNPRO_C && __STDC__))) \
58 && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
59# define _GL_INLINE inline
60# define _GL_EXTERN_INLINE extern inline
61# define _GL_EXTERN_INLINE_IN_USE
62#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \
63 && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
64# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__
65 /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */
66# define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
67# else
68# define _GL_INLINE extern inline
69# endif
70# define _GL_EXTERN_INLINE extern
71# define _GL_EXTERN_INLINE_IN_USE
72#else
73# define _GL_INLINE static _GL_UNUSED
74# define _GL_EXTERN_INLINE static _GL_UNUSED
75#endif
76
77#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
78# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__
79# define _GL_INLINE_HEADER_CONST_PRAGMA
80# else
81# define _GL_INLINE_HEADER_CONST_PRAGMA \
82 _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"")
83# endif
84 /* Suppress GCC's bogus "no previous prototype for 'FOO'"
85 and "no previous declaration for 'FOO'" diagnostics,
86 when FOO is an inline function in the header; see
87 <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>. */
88# define _GL_INLINE_HEADER_BEGIN \
89 _Pragma ("GCC diagnostic push") \
90 _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
91 _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \
92 _GL_INLINE_HEADER_CONST_PRAGMA
93# define _GL_INLINE_HEADER_END \
94 _Pragma ("GCC diagnostic pop")
95#else
96# define _GL_INLINE_HEADER_BEGIN
97# define _GL_INLINE_HEADER_END
98#endif])
99])
diff --git a/m4/fcntl-o.m4 b/m4/fcntl-o.m4
new file mode 100644
index 000000000..43c93124e
--- /dev/null
+++ b/m4/fcntl-o.m4
@@ -0,0 +1,134 @@
1# fcntl-o.m4 serial 4
2dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6
7dnl Written by Paul Eggert.
8
9# Test whether the flags O_NOATIME and O_NOFOLLOW actually work.
10# Define HAVE_WORKING_O_NOATIME to 1 if O_NOATIME works, or to 0 otherwise.
11# Define HAVE_WORKING_O_NOFOLLOW to 1 if O_NOFOLLOW works, or to 0 otherwise.
12AC_DEFUN([gl_FCNTL_O_FLAGS],
13[
14 dnl Persuade glibc <fcntl.h> to define O_NOATIME and O_NOFOLLOW.
15 dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes
16 dnl AC_GNU_SOURCE.
17 m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
18 [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])],
19 [AC_REQUIRE([AC_GNU_SOURCE])])
20
21 AC_CHECK_HEADERS_ONCE([unistd.h])
22 AC_CHECK_FUNCS_ONCE([symlink])
23 AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h],
24 [AC_RUN_IFELSE(
25 [AC_LANG_PROGRAM(
26 [[#include <sys/types.h>
27 #include <sys/stat.h>
28 #if HAVE_UNISTD_H
29 # include <unistd.h>
30 #else /* on Windows with MSVC */
31 # include <io.h>
32 # include <stdlib.h>
33 # defined sleep(n) _sleep ((n) * 1000)
34 #endif
35 #include <fcntl.h>
36 #ifndef O_NOATIME
37 #define O_NOATIME 0
38 #endif
39 #ifndef O_NOFOLLOW
40 #define O_NOFOLLOW 0
41 #endif
42 static int const constants[] =
43 {
44 O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND,
45 O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY
46 };
47 ]],
48 [[
49 int result = !constants;
50 #if HAVE_SYMLINK
51 {
52 static char const sym[] = "conftest.sym";
53 if (symlink ("/dev/null", sym) != 0)
54 result |= 2;
55 else
56 {
57 int fd = open (sym, O_WRONLY | O_NOFOLLOW | O_CREAT, 0);
58 if (fd >= 0)
59 {
60 close (fd);
61 result |= 4;
62 }
63 }
64 if (unlink (sym) != 0 || symlink (".", sym) != 0)
65 result |= 2;
66 else
67 {
68 int fd = open (sym, O_RDONLY | O_NOFOLLOW);
69 if (fd >= 0)
70 {
71 close (fd);
72 result |= 4;
73 }
74 }
75 unlink (sym);
76 }
77 #endif
78 {
79 static char const file[] = "confdefs.h";
80 int fd = open (file, O_RDONLY | O_NOATIME);
81 if (fd < 0)
82 result |= 8;
83 else
84 {
85 struct stat st0;
86 if (fstat (fd, &st0) != 0)
87 result |= 16;
88 else
89 {
90 char c;
91 sleep (1);
92 if (read (fd, &c, 1) != 1)
93 result |= 24;
94 else
95 {
96 if (close (fd) != 0)
97 result |= 32;
98 else
99 {
100 struct stat st1;
101 if (stat (file, &st1) != 0)
102 result |= 40;
103 else
104 if (st0.st_atime != st1.st_atime)
105 result |= 64;
106 }
107 }
108 }
109 }
110 }
111 return result;]])],
112 [gl_cv_header_working_fcntl_h=yes],
113 [case $? in #(
114 4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
115 64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
116 68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
117 *) gl_cv_header_working_fcntl_h='no';;
118 esac],
119 [gl_cv_header_working_fcntl_h=cross-compiling])])
120
121 case $gl_cv_header_working_fcntl_h in #(
122 *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
123 *) ac_val=1;;
124 esac
125 AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOATIME], [$ac_val],
126 [Define to 1 if O_NOATIME works.])
127
128 case $gl_cv_header_working_fcntl_h in #(
129 *O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #(
130 *) ac_val=1;;
131 esac
132 AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOFOLLOW], [$ac_val],
133 [Define to 1 if O_NOFOLLOW works.])
134])
diff --git a/m4/glibc2.m4 b/m4/glibc2.m4
index e8f5bfe6e..71dd8a123 100644
--- a/m4/glibc2.m4
+++ b/m4/glibc2.m4
@@ -1,5 +1,6 @@
1# glibc2.m4 serial 1 1# glibc2.m4 serial 3
2dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc. 2dnl Copyright (C) 2000-2002, 2004, 2008, 2010-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.
@@ -9,22 +10,22 @@ dnl with or without modifications, as long as this notice is preserved.
9 10
10AC_DEFUN([gt_GLIBC2], 11AC_DEFUN([gt_GLIBC2],
11 [ 12 [
12 AC_CACHE_CHECK(whether we are using the GNU C Library 2 or newer, 13 AC_CACHE_CHECK([whether we are using the GNU C Library 2 or newer],
13 ac_cv_gnu_library_2, 14 [ac_cv_gnu_library_2],
14 [AC_EGREP_CPP([Lucky GNU user], 15 [AC_EGREP_CPP([Lucky GNU user],
15 [ 16 [
16#include <features.h> 17#include <features.h>
17#ifdef __GNU_LIBRARY__ 18#ifdef __GNU_LIBRARY__
18 #if (__GLIBC__ >= 2) 19 #if (__GLIBC__ >= 2) && !defined __UCLIBC__
19 Lucky GNU user 20 Lucky GNU user
20 #endif 21 #endif
21#endif 22#endif
22 ], 23 ],
23 ac_cv_gnu_library_2=yes, 24 [ac_cv_gnu_library_2=yes],
24 ac_cv_gnu_library_2=no) 25 [ac_cv_gnu_library_2=no])
25 ] 26 ]
26 ) 27 )
27 AC_SUBST(GLIBC2) 28 AC_SUBST([GLIBC2])
28 GLIBC2="$ac_cv_gnu_library_2" 29 GLIBC2="$ac_cv_gnu_library_2"
29 ] 30 ]
30) 31)
diff --git a/m4/glibc21.m4 b/m4/glibc21.m4
index d95fd9861..ab58b7121 100644
--- a/m4/glibc21.m4
+++ b/m4/glibc21.m4
@@ -1,30 +1,34 @@
1# glibc21.m4 serial 3 1# glibc21.m4 serial 5
2dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc. 2dnl Copyright (C) 2000-2002, 2004, 2008, 2010-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.
6 7
7# Test for the GNU C Library, version 2.1 or newer. 8# Test for the GNU C Library, version 2.1 or newer, or uClibc.
8# From Bruno Haible. 9# From Bruno Haible.
9 10
10AC_DEFUN([gl_GLIBC21], 11AC_DEFUN([gl_GLIBC21],
11 [ 12 [
12 AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, 13 AC_CACHE_CHECK([whether we are using the GNU C Library >= 2.1 or uClibc],
13 ac_cv_gnu_library_2_1, 14 [ac_cv_gnu_library_2_1],
14 [AC_EGREP_CPP([Lucky GNU user], 15 [AC_EGREP_CPP([Lucky],
15 [ 16 [
16#include <features.h> 17#include <features.h>
17#ifdef __GNU_LIBRARY__ 18#ifdef __GNU_LIBRARY__
18 #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) 19 #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
19 Lucky GNU user 20 Lucky GNU user
20 #endif 21 #endif
21#endif 22#endif
22 ], 23#ifdef __UCLIBC__
23 ac_cv_gnu_library_2_1=yes, 24 Lucky user
24 ac_cv_gnu_library_2_1=no) 25#endif
26 ],
27 [ac_cv_gnu_library_2_1=yes],
28 [ac_cv_gnu_library_2_1=no])
25 ] 29 ]
26 ) 30 )
27 AC_SUBST(GLIBC21) 31 AC_SUBST([GLIBC21])
28 GLIBC21="$ac_cv_gnu_library_2_1" 32 GLIBC21="$ac_cv_gnu_library_2_1"
29 ] 33 ]
30) 34)
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index 654c41589..4b29c5f2c 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -1,5 +1,5 @@
1# iconv.m4 serial AM4 (gettext-0.11.3) 1# iconv.m4 serial 18 (gettext-0.18.2)
2dnl Copyright (C) 2000-2002 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.
@@ -21,6 +21,7 @@ AC_DEFUN([AM_ICONV_LINK],
21[ 21[
22 dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and 22 dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
23 dnl those with the standalone portable GNU libiconv installed). 23 dnl those with the standalone portable GNU libiconv installed).
24 AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
24 25
25 dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV 26 dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
26 dnl accordingly. 27 dnl accordingly.
@@ -29,34 +30,170 @@ AC_DEFUN([AM_ICONV_LINK],
29 dnl Add $INCICONV to CPPFLAGS before performing the following checks, 30 dnl Add $INCICONV to CPPFLAGS before performing the following checks,
30 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
31 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
32 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.
33 am_save_CPPFLAGS="$CPPFLAGS" 34 am_save_CPPFLAGS="$CPPFLAGS"
34 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) 35 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
35 36
36 AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ 37 AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
37 am_cv_func_iconv="no, consider installing GNU libiconv" 38 am_cv_func_iconv="no, consider installing GNU libiconv"
38 am_cv_lib_iconv=no 39 am_cv_lib_iconv=no
39 AC_TRY_LINK([#include <stdlib.h> 40 AC_LINK_IFELSE(
40#include <iconv.h>], 41 [AC_LANG_PROGRAM(
41 [iconv_t cd = iconv_open("",""); 42 [[
42 iconv(cd,NULL,NULL,NULL,NULL); 43#include <stdlib.h>
43 iconv_close(cd);], 44#include <iconv.h>
44 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])
45 if test "$am_cv_func_iconv" != yes; then 50 if test "$am_cv_func_iconv" != yes; then
46 am_save_LIBS="$LIBS" 51 am_save_LIBS="$LIBS"
47 LIBS="$LIBS $LIBICONV" 52 LIBS="$LIBS $LIBICONV"
48 AC_TRY_LINK([#include <stdlib.h> 53 AC_LINK_IFELSE(
49#include <iconv.h>], 54 [AC_LANG_PROGRAM(
50 [iconv_t cd = iconv_open("",""); 55 [[
51 iconv(cd,NULL,NULL,NULL,NULL); 56#include <stdlib.h>
52 iconv_close(cd);], 57#include <iconv.h>
53 am_cv_lib_iconv=yes 58 ]],
54 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])
55 LIBS="$am_save_LIBS" 64 LIBS="$am_save_LIBS"
56 fi 65 fi
57 ]) 66 ])
58 if test "$am_cv_func_iconv" = yes; then 67 if test "$am_cv_func_iconv" = yes; then
59 AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) 68 AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
69 dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
70 dnl Solaris 10.
71 am_save_LIBS="$LIBS"
72 if test $am_cv_lib_iconv = yes; then
73 LIBS="$LIBS $LIBICONV"
74 fi
75 AC_RUN_IFELSE(
76 [AC_LANG_SOURCE([[
77#include <iconv.h>
78#include <string.h>
79int main ()
80{
81 int result = 0;
82 /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
83 returns. */
84 {
85 iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
86 if (cd_utf8_to_88591 != (iconv_t)(-1))
87 {
88 static const char input[] = "\342\202\254"; /* EURO SIGN */
89 char buf[10];
90 const char *inptr = input;
91 size_t inbytesleft = strlen (input);
92 char *outptr = buf;
93 size_t outbytesleft = sizeof (buf);
94 size_t res = iconv (cd_utf8_to_88591,
95 (char **) &inptr, &inbytesleft,
96 &outptr, &outbytesleft);
97 if (res == 0)
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);
139 }
140 }
141#if 0 /* This bug could be worked around by the caller. */
142 /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
143 {
144 iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
145 if (cd_88591_to_utf8 != (iconv_t)(-1))
146 {
147 static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
148 char buf[50];
149 const char *inptr = input;
150 size_t inbytesleft = strlen (input);
151 char *outptr = buf;
152 size_t outbytesleft = sizeof (buf);
153 size_t res = iconv (cd_88591_to_utf8,
154 (char **) &inptr, &inbytesleft,
155 &outptr, &outbytesleft);
156 if ((int)res > 0)
157 result |= 8;
158 iconv_close (cd_88591_to_utf8);
159 }
160 }
161#endif
162 /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
163 provided. */
164 if (/* Try standardized names. */
165 iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
166 /* Try IRIX, OSF/1 names. */
167 && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
168 /* Try AIX names. */
169 && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
170 /* Try HP-UX names. */
171 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
172 result |= 16;
173 return result;
174}]])],
175 [am_cv_func_iconv_works=yes],
176 [am_cv_func_iconv_works=no],
177 [
178changequote(,)dnl
179 case "$host_os" in
180 aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
181 *) am_cv_func_iconv_works="guessing yes" ;;
182 esac
183changequote([,])dnl
184 ])
185 LIBS="$am_save_LIBS"
186 ])
187 case "$am_cv_func_iconv_works" in
188 *no) am_func_iconv=no am_cv_lib_iconv=no ;;
189 *) am_func_iconv=yes ;;
190 esac
191 else
192 am_func_iconv=no am_cv_lib_iconv=no
193 fi
194 if test "$am_func_iconv" = yes; then
195 AC_DEFINE([HAVE_ICONV], [1],
196 [Define if you have the iconv() function and it works.])
60 fi 197 fi
61 if test "$am_cv_lib_iconv" = yes; then 198 if test "$am_cv_lib_iconv" = yes; then
62 AC_MSG_CHECKING([how to link with libiconv]) 199 AC_MSG_CHECKING([how to link with libiconv])
@@ -68,34 +205,64 @@ AC_DEFUN([AM_ICONV_LINK],
68 LIBICONV= 205 LIBICONV=
69 LTLIBICONV= 206 LTLIBICONV=
70 fi 207 fi
71 AC_SUBST(LIBICONV) 208 AC_SUBST([LIBICONV])
72 AC_SUBST(LTLIBICONV) 209 AC_SUBST([LTLIBICONV])
73]) 210])
74 211
75AC_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],
76[ 231[
77 AM_ICONV_LINK 232 AM_ICONV_LINK
78 if test "$am_cv_func_iconv" = yes; then 233 if test "$am_cv_func_iconv" = yes; then
79 AC_MSG_CHECKING([for iconv declaration]) 234 AC_MSG_CHECKING([for iconv declaration])
80 AC_CACHE_VAL(am_cv_proto_iconv, [ 235 AC_CACHE_VAL([am_cv_proto_iconv], [
81 AC_TRY_COMPILE([ 236 AC_COMPILE_IFELSE(
237 [AC_LANG_PROGRAM(
238 [[
82#include <stdlib.h> 239#include <stdlib.h>
83#include <iconv.h> 240#include <iconv.h>
84extern 241extern
85#ifdef __cplusplus 242#ifdef __cplusplus
86"C" 243"C"
87#endif 244#endif
88#if defined(__STDC__) || defined(__cplusplus) 245#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
89size_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);
90#else 247#else
91size_t iconv(); 248size_t iconv();
92#endif 249#endif
93], [], 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"])
94 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);"])
95 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/( /(/'`
96 AC_MSG_RESULT([$]{ac_t:- 256 AC_MSG_RESULT([
97 }[$]am_cv_proto_iconv) 257 $am_cv_proto_iconv])
98 AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, 258 AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
99 [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 ])
100 fi 267 fi
101]) 268])
diff --git a/m4/intdiv0.m4 b/m4/intdiv0.m4
index b8d78176a..afa9acb82 100644
--- a/m4/intdiv0.m4
+++ b/m4/intdiv0.m4
@@ -1,5 +1,5 @@
1# intdiv0.m4 serial 1 (gettext-0.11.3) 1# intdiv0.m4 serial 6 (gettext-0.18.2)
2dnl Copyright (C) 2002 Free Software Foundation, Inc. 2dnl Copyright (C) 2002, 2007-2008, 2010-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.
@@ -14,16 +14,28 @@ AC_DEFUN([gt_INTDIV0],
14 AC_CACHE_CHECK([whether integer division by zero raises SIGFPE], 14 AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
15 gt_cv_int_divbyzero_sigfpe, 15 gt_cv_int_divbyzero_sigfpe,
16 [ 16 [
17 AC_TRY_RUN([ 17 gt_cv_int_divbyzero_sigfpe=
18changequote(,)dnl
19 case "$host_os" in
20 macos* | darwin[6-9]* | darwin[1-9][0-9]*)
21 # On Mac OS X 10.2 or newer, just assume the same as when cross-
22 # compiling. If we were to perform the real test, 1 Crash Report
23 # dialog window would pop up.
24 case "$host_cpu" in
25 i[34567]86 | x86_64)
26 gt_cv_int_divbyzero_sigfpe="guessing yes" ;;
27 esac
28 ;;
29 esac
30changequote([,])dnl
31 if test -z "$gt_cv_int_divbyzero_sigfpe"; then
32 AC_RUN_IFELSE(
33 [AC_LANG_SOURCE([[
18#include <stdlib.h> 34#include <stdlib.h>
19#include <signal.h> 35#include <signal.h>
20 36
21static void 37static void
22#ifdef __cplusplus
23sigfpe_handler (int sig) 38sigfpe_handler (int sig)
24#else
25sigfpe_handler (sig) int sig;
26#endif
27{ 39{
28 /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ 40 /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
29 exit (sig != SIGFPE); 41 exit (sig != SIGFPE);
@@ -48,23 +60,28 @@ int main ()
48 60
49 z = x / y; 61 z = x / y;
50 nan = y / y; 62 nan = y / y;
51 exit (1); 63 exit (2);
52} 64}
53], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, 65]])],
54 [ 66 [gt_cv_int_divbyzero_sigfpe=yes],
55 # Guess based on the CPU. 67 [gt_cv_int_divbyzero_sigfpe=no],
56 case "$host_cpu" in 68 [
57 alpha* | i[34567]86 | m68k | s390*) 69 # Guess based on the CPU.
58 gt_cv_int_divbyzero_sigfpe="guessing yes";; 70changequote(,)dnl
59 *) 71 case "$host_cpu" in
60 gt_cv_int_divbyzero_sigfpe="guessing no";; 72 alpha* | i[34567]86 | x86_64 | m68k | s390*)
61 esac 73 gt_cv_int_divbyzero_sigfpe="guessing yes";;
62 ]) 74 *)
75 gt_cv_int_divbyzero_sigfpe="guessing no";;
76 esac
77changequote([,])dnl
78 ])
79 fi
63 ]) 80 ])
64 case "$gt_cv_int_divbyzero_sigfpe" in 81 case "$gt_cv_int_divbyzero_sigfpe" in
65 *yes) value=1;; 82 *yes) value=1;;
66 *) value=0;; 83 *) value=0;;
67 esac 84 esac
68 AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value, 85 AC_DEFINE_UNQUOTED([INTDIV0_RAISES_SIGFPE], [$value],
69 [Define if integer division by zero raises signal SIGFPE.]) 86 [Define if integer division by zero raises signal SIGFPE.])
70]) 87])
diff --git a/m4/intldir.m4 b/m4/intldir.m4
index 7a28843f6..73b672a57 100644
--- a/m4/intldir.m4
+++ b/m4/intldir.m4
@@ -1,5 +1,5 @@
1# intldir.m4 serial 1 (gettext-0.16) 1# intldir.m4 serial 2 (gettext-0.18)
2dnl Copyright (C) 2006 Free Software Foundation, Inc. 2dnl Copyright (C) 2006, 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.
@@ -13,7 +13,7 @@ dnl by the GNU Library General Public License, and the rest of the GNU
13dnl gettext package package is covered by the GNU General Public License. 13dnl gettext package package is covered by the GNU General Public License.
14dnl They are *not* in the public domain. 14dnl They are *not* in the public domain.
15 15
16AC_PREREQ(2.52) 16AC_PREREQ([2.52])
17 17
18dnl Tells the AM_GNU_GETTEXT macro to consider an intl/ directory. 18dnl Tells the AM_GNU_GETTEXT macro to consider an intl/ directory.
19AC_DEFUN([AM_GNU_GETTEXT_INTL_SUBDIR], []) 19AC_DEFUN([AM_GNU_GETTEXT_INTL_SUBDIR], [])
diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4
new file mode 100644
index 000000000..8a045f6a2
--- /dev/null
+++ b/m4/intlmacosx.m4
@@ -0,0 +1,56 @@
1# intlmacosx.m4 serial 5 (gettext-0.18.2)
2dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6dnl
7dnl This file can can be used in projects which are not available under
8dnl the GNU General Public License or the GNU Library General Public
9dnl License but which still want to provide support for the GNU gettext
10dnl functionality.
11dnl Please note that the actual code of the GNU gettext library is covered
12dnl by the GNU Library General Public License, and the rest of the GNU
13dnl gettext package package is covered by the GNU General Public License.
14dnl They are *not* in the public domain.
15
16dnl Checks for special options needed on Mac OS X.
17dnl Defines INTL_MACOSX_LIBS.
18AC_DEFUN([gt_INTL_MACOSX],
19[
20 dnl Check for API introduced in Mac OS X 10.2.
21 AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
22 [gt_cv_func_CFPreferencesCopyAppValue],
23 [gt_save_LIBS="$LIBS"
24 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
25 AC_LINK_IFELSE(
26 [AC_LANG_PROGRAM(
27 [[#include <CoreFoundation/CFPreferences.h>]],
28 [[CFPreferencesCopyAppValue(NULL, NULL)]])],
29 [gt_cv_func_CFPreferencesCopyAppValue=yes],
30 [gt_cv_func_CFPreferencesCopyAppValue=no])
31 LIBS="$gt_save_LIBS"])
32 if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
33 AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
34 [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
35 fi
36 dnl Check for API introduced in Mac OS X 10.3.
37 AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
38 [gt_save_LIBS="$LIBS"
39 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
40 AC_LINK_IFELSE(
41 [AC_LANG_PROGRAM(
42 [[#include <CoreFoundation/CFLocale.h>]],
43 [[CFLocaleCopyCurrent();]])],
44 [gt_cv_func_CFLocaleCopyCurrent=yes],
45 [gt_cv_func_CFLocaleCopyCurrent=no])
46 LIBS="$gt_save_LIBS"])
47 if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
48 AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
49 [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
50 fi
51 INTL_MACOSX_LIBS=
52 if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
53 INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
54 fi
55 AC_SUBST([INTL_MACOSX_LIBS])
56])
diff --git a/m4/intmax.m4 b/m4/intmax.m4
index ce7a8a49d..f70ceeea1 100644
--- a/m4/intmax.m4
+++ b/m4/intmax.m4
@@ -1,5 +1,5 @@
1# intmax.m4 serial 3 (gettext-0.16) 1# intmax.m4 serial 6 (gettext-0.18.2)
2dnl Copyright (C) 2002-2005 Free Software Foundation, Inc. 2dnl Copyright (C) 2002-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.
@@ -12,8 +12,10 @@ AC_DEFUN([gt_TYPE_INTMAX_T],
12[ 12[
13 AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) 13 AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
14 AC_REQUIRE([gl_AC_HEADER_STDINT_H]) 14 AC_REQUIRE([gl_AC_HEADER_STDINT_H])
15 AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t, 15 AC_CACHE_CHECK([for intmax_t], [gt_cv_c_intmax_t],
16 [AC_TRY_COMPILE([ 16 [AC_COMPILE_IFELSE(
17 [AC_LANG_PROGRAM(
18 [[
17#include <stddef.h> 19#include <stddef.h>
18#include <stdlib.h> 20#include <stdlib.h>
19#if HAVE_STDINT_H_WITH_UINTMAX 21#if HAVE_STDINT_H_WITH_UINTMAX
@@ -22,12 +24,13 @@ AC_DEFUN([gt_TYPE_INTMAX_T],
22#if HAVE_INTTYPES_H_WITH_UINTMAX 24#if HAVE_INTTYPES_H_WITH_UINTMAX
23#include <inttypes.h> 25#include <inttypes.h>
24#endif 26#endif
25], [intmax_t x = -1; 27 ]],
26 return !x;], 28 [[intmax_t x = -1;
27 gt_cv_c_intmax_t=yes, 29 return !x;]])],
28 gt_cv_c_intmax_t=no)]) 30 [gt_cv_c_intmax_t=yes],
31 [gt_cv_c_intmax_t=no])])
29 if test $gt_cv_c_intmax_t = yes; then 32 if test $gt_cv_c_intmax_t = yes; then
30 AC_DEFINE(HAVE_INTMAX_T, 1, 33 AC_DEFINE([HAVE_INTMAX_T], [1],
31 [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.]) 34 [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
32 fi 35 fi
33]) 36])
diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4
index 7c7f89401..00251e1db 100644
--- a/m4/inttypes-pri.m4
+++ b/m4/inttypes-pri.m4
@@ -1,12 +1,12 @@
1# inttypes-pri.m4 serial 4 (gettext-0.16) 1# inttypes-pri.m4 serial 7 (gettext-0.18.2)
2dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc. 2dnl Copyright (C) 1997-2002, 2006, 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.
6 6
7dnl From Bruno Haible. 7dnl From Bruno Haible.
8 8
9AC_PREREQ(2.52) 9AC_PREREQ([2.53])
10 10
11# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI* 11# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
12# macros to non-string values. This is the case on AIX 4.3.3. 12# macros to non-string values. This is the case on AIX 4.3.3.
@@ -16,17 +16,23 @@ AC_DEFUN([gt_INTTYPES_PRI],
16 AC_CHECK_HEADERS([inttypes.h]) 16 AC_CHECK_HEADERS([inttypes.h])
17 if test $ac_cv_header_inttypes_h = yes; then 17 if test $ac_cv_header_inttypes_h = yes; then
18 AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], 18 AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
19 gt_cv_inttypes_pri_broken, 19 [gt_cv_inttypes_pri_broken],
20 [ 20 [
21 AC_TRY_COMPILE([#include <inttypes.h> 21 AC_COMPILE_IFELSE(
22 [AC_LANG_PROGRAM(
23 [[
24#include <inttypes.h>
22#ifdef PRId32 25#ifdef PRId32
23char *p = PRId32; 26char *p = PRId32;
24#endif 27#endif
25], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes) 28 ]],
29 [[]])],
30 [gt_cv_inttypes_pri_broken=no],
31 [gt_cv_inttypes_pri_broken=yes])
26 ]) 32 ])
27 fi 33 fi
28 if test "$gt_cv_inttypes_pri_broken" = yes; then 34 if test "$gt_cv_inttypes_pri_broken" = yes; then
29 AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, 35 AC_DEFINE_UNQUOTED([PRI_MACROS_BROKEN], [1],
30 [Define if <inttypes.h> exists and defines unusable PRI* macros.]) 36 [Define if <inttypes.h> exists and defines unusable PRI* macros.])
31 PRI_MACROS_BROKEN=1 37 PRI_MACROS_BROKEN=1
32 else 38 else
diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4
index edc8ecb2d..87be9cfb5 100644
--- a/m4/inttypes_h.m4
+++ b/m4/inttypes_h.m4
@@ -1,5 +1,5 @@
1# inttypes_h.m4 serial 7 1# inttypes_h.m4 serial 10
2dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc. 2dnl Copyright (C) 1997-2004, 2006, 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.
@@ -11,15 +11,18 @@ dnl From Paul Eggert.
11 11
12AC_DEFUN([gl_AC_HEADER_INTTYPES_H], 12AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
13[ 13[
14 AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h, 14 AC_CACHE_CHECK([for inttypes.h], [gl_cv_header_inttypes_h],
15 [AC_TRY_COMPILE( 15 [AC_COMPILE_IFELSE(
16 [#include <sys/types.h> 16 [AC_LANG_PROGRAM(
17#include <inttypes.h>], 17 [[
18 [uintmax_t i = (uintmax_t) -1; return !i;], 18#include <sys/types.h>
19 gl_cv_header_inttypes_h=yes, 19#include <inttypes.h>
20 gl_cv_header_inttypes_h=no)]) 20 ]],
21 [[uintmax_t i = (uintmax_t) -1; return !i;]])],
22 [gl_cv_header_inttypes_h=yes],
23 [gl_cv_header_inttypes_h=no])])
21 if test $gl_cv_header_inttypes_h = yes; then 24 if test $gl_cv_header_inttypes_h = yes; then
22 AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, 25 AC_DEFINE_UNQUOTED([HAVE_INTTYPES_H_WITH_UINTMAX], [1],
23 [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, 26 [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
24 and declares uintmax_t. ]) 27 and declares uintmax_t. ])
25 fi 28 fi
diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4
index 19aa77e4f..7470ec597 100644
--- a/m4/lcmessage.m4
+++ b/m4/lcmessage.m4
@@ -1,5 +1,6 @@
1# lcmessage.m4 serial 4 (gettext-0.14.2) 1# lcmessage.m4 serial 7 (gettext-0.18.2)
2dnl Copyright (C) 1995-2002, 2004-2005 Free Software Foundation, Inc. 2dnl Copyright (C) 1995-2002, 2004-2005, 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.
@@ -20,11 +21,15 @@ dnl Ulrich Drepper <drepper@cygnus.com>, 1995.
20 21
21AC_DEFUN([gt_LC_MESSAGES], 22AC_DEFUN([gt_LC_MESSAGES],
22[ 23[
23 AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES, 24 AC_CACHE_CHECK([for LC_MESSAGES], [gt_cv_val_LC_MESSAGES],
24 [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], 25 [AC_LINK_IFELSE(
25 gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)]) 26 [AC_LANG_PROGRAM(
27 [[#include <locale.h>]],
28 [[return LC_MESSAGES]])],
29 [gt_cv_val_LC_MESSAGES=yes],
30 [gt_cv_val_LC_MESSAGES=no])])
26 if test $gt_cv_val_LC_MESSAGES = yes; then 31 if test $gt_cv_val_LC_MESSAGES = yes; then
27 AC_DEFINE(HAVE_LC_MESSAGES, 1, 32 AC_DEFINE([HAVE_LC_MESSAGES], [1],
28 [Define if your <locale.h> file defines LC_MESSAGES.]) 33 [Define if your <locale.h> file defines LC_MESSAGES.])
29 fi 34 fi
30]) 35])
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
index 96c4e2c33..ddc569f73 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 f95b7ba88..3522d994d 100644
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -1,58 +1,66 @@
1# lib-link.m4 serial 9 (gettext-0.16) 1# lib-link.m4 serial 26 (gettext-0.18.2)
2dnl Copyright (C) 2001-2006 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.50) 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.
13dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and 13dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
14dnl augments the CPPFLAGS variable. 14dnl augments the CPPFLAGS variable.
15dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
16dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
15AC_DEFUN([AC_LIB_LINKFLAGS], 17AC_DEFUN([AC_LIB_LINKFLAGS],
16[ 18[
17 AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) 19 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
18 AC_REQUIRE([AC_LIB_RPATH]) 20 AC_REQUIRE([AC_LIB_RPATH])
19 define([Name],[translit([$1],[./-], [___])]) 21 pushdef([Name],[m4_translit([$1],[./+-], [____])])
20 define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], 22 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
21 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) 23 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
22 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], [
23 AC_LIB_LINKFLAGS_BODY([$1], [$2]) 25 AC_LIB_LINKFLAGS_BODY([$1], [$2])
24 ac_cv_lib[]Name[]_libs="$LIB[]NAME" 26 ac_cv_lib[]Name[]_libs="$LIB[]NAME"
25 ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" 27 ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
26 ac_cv_lib[]Name[]_cppflags="$INC[]NAME" 28 ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
29 ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
27 ]) 30 ])
28 LIB[]NAME="$ac_cv_lib[]Name[]_libs" 31 LIB[]NAME="$ac_cv_lib[]Name[]_libs"
29 LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" 32 LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
30 INC[]NAME="$ac_cv_lib[]Name[]_cppflags" 33 INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
34 LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
31 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) 35 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
32 AC_SUBST([LIB]NAME) 36 AC_SUBST([LIB]NAME)
33 AC_SUBST([LTLIB]NAME) 37 AC_SUBST([LTLIB]NAME)
38 AC_SUBST([LIB]NAME[_PREFIX])
34 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
35 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.
36 HAVE_LIB[]NAME=yes 41 HAVE_LIB[]NAME=yes
37 undefine([Name]) 42 popdef([NAME])
38 undefine([NAME]) 43 popdef([Name])
39]) 44])
40 45
41dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) 46dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
42dnl searches for libname and the libraries corresponding to explicit and 47dnl searches for libname and the libraries corresponding to explicit and
43dnl implicit dependencies, together with the specified include files and 48dnl implicit dependencies, together with the specified include files and
44dnl 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
45dnl 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.
46dnl 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
47dnl #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
48dnl 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.
55dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
56dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
49AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], 57AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
50[ 58[
51 AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) 59 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
52 AC_REQUIRE([AC_LIB_RPATH]) 60 AC_REQUIRE([AC_LIB_RPATH])
53 define([Name],[translit([$1],[./-], [___])]) 61 pushdef([Name],[m4_translit([$1],[./+-], [____])])
54 define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], 62 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
55 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) 63 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
56 64
57 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
58 dnl accordingly. 66 dnl accordingly.
@@ -66,13 +74,26 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
66 74
67 AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ 75 AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
68 ac_save_LIBS="$LIBS" 76 ac_save_LIBS="$LIBS"
69 LIBS="$LIBS $LIB[]NAME" 77 dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
70 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]])'])
71 LIBS="$ac_save_LIBS" 92 LIBS="$ac_save_LIBS"
72 ]) 93 ])
73 if test "$ac_cv_lib[]Name" = yes; then 94 if test "$ac_cv_lib[]Name" = yes; then
74 HAVE_LIB[]NAME=yes 95 HAVE_LIB[]NAME=yes
75 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.])
76 AC_MSG_CHECKING([how to link with lib[]$1]) 97 AC_MSG_CHECKING([how to link with lib[]$1])
77 AC_MSG_RESULT([$LIB[]NAME]) 98 AC_MSG_RESULT([$LIB[]NAME])
78 else 99 else
@@ -82,17 +103,25 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
82 CPPFLAGS="$ac_save_CPPFLAGS" 103 CPPFLAGS="$ac_save_CPPFLAGS"
83 LIB[]NAME= 104 LIB[]NAME=
84 LTLIB[]NAME= 105 LTLIB[]NAME=
106 LIB[]NAME[]_PREFIX=
85 fi 107 fi
86 AC_SUBST([HAVE_LIB]NAME) 108 AC_SUBST([HAVE_LIB]NAME)
87 AC_SUBST([LIB]NAME) 109 AC_SUBST([LIB]NAME)
88 AC_SUBST([LTLIB]NAME) 110 AC_SUBST([LTLIB]NAME)
89 undefine([Name]) 111 AC_SUBST([LIB]NAME[_PREFIX])
90 undefine([NAME]) 112 popdef([NAME])
113 popdef([Name])
91]) 114])
92 115
93dnl Determine the platform dependent parameters needed to use rpath: 116dnl Determine the platform dependent parameters needed to use rpath:
94dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, 117dnl acl_libext,
95dnl hardcode_direct, hardcode_minus_L. 118dnl acl_shlibext,
119dnl acl_libname_spec,
120dnl acl_library_names_spec,
121dnl acl_hardcode_libdir_flag_spec,
122dnl acl_hardcode_libdir_separator,
123dnl acl_hardcode_direct,
124dnl acl_hardcode_minus_L.
96AC_DEFUN([AC_LIB_RPATH], 125AC_DEFUN([AC_LIB_RPATH],
97[ 126[
98 dnl Tell automake >= 1.10 to complain if config.rpath is missing. 127 dnl Tell automake >= 1.10 to complain if config.rpath is missing.
@@ -101,7 +130,7 @@ AC_DEFUN([AC_LIB_RPATH],
101 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
102 AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host 131 AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
103 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
104 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], [
105 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" \
106 ${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
107 . ./conftest.sh 136 . ./conftest.sh
@@ -109,35 +138,66 @@ AC_DEFUN([AC_LIB_RPATH],
109 acl_cv_rpath=done 138 acl_cv_rpath=done
110 ]) 139 ])
111 wl="$acl_cv_wl" 140 wl="$acl_cv_wl"
112 libext="$acl_cv_libext" 141 acl_libext="$acl_cv_libext"
113 shlibext="$acl_cv_shlibext" 142 acl_shlibext="$acl_cv_shlibext"
114 hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" 143 acl_libname_spec="$acl_cv_libname_spec"
115 hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" 144 acl_library_names_spec="$acl_cv_library_names_spec"
116 hardcode_direct="$acl_cv_hardcode_direct" 145 acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
117 hardcode_minus_L="$acl_cv_hardcode_minus_L" 146 acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
147 acl_hardcode_direct="$acl_cv_hardcode_direct"
148 acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
118 dnl Determine whether the user wants rpath handling at all. 149 dnl Determine whether the user wants rpath handling at all.
119 AC_ARG_ENABLE(rpath, 150 AC_ARG_ENABLE([rpath],
120 [ --disable-rpath do not hardcode runtime library paths], 151 [ --disable-rpath do not hardcode runtime library paths],
121 :, enable_rpath=yes) 152 :, enable_rpath=yes)
122]) 153])
123 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
124dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and 176dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
125dnl the libraries corresponding to explicit and implicit dependencies. 177dnl the libraries corresponding to explicit and implicit dependencies.
126dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. 178dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
179dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
180dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
127AC_DEFUN([AC_LIB_LINKFLAGS_BODY], 181AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
128[ 182[
129 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) 183 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
130 define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], 184 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
131 [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])])
190 dnl Autoconf >= 2.61 supports dots in --with options.
191 pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])
132 dnl By default, look in $includedir and $libdir. 192 dnl By default, look in $includedir and $libdir.
133 use_additional=yes 193 use_additional=yes
134 AC_LIB_WITH_FINAL_PREFIX([ 194 AC_LIB_WITH_FINAL_PREFIX([
135 eval additional_includedir=\"$includedir\" 195 eval additional_includedir=\"$includedir\"
136 eval additional_libdir=\"$libdir\" 196 eval additional_libdir=\"$libdir\"
137 ]) 197 ])
138 AC_LIB_ARG_WITH([lib$1-prefix], 198 AC_ARG_WITH(P_A_C_K[-prefix],
139[ --with-lib$1-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
140 --without-lib$1-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]],
141[ 201[
142 if test "X$withval" = "Xno"; then 202 if test "X$withval" = "Xno"; then
143 use_additional=no 203 use_additional=no
@@ -150,6 +210,10 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
150 else 210 else
151 additional_includedir="$withval/include" 211 additional_includedir="$withval/include"
152 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
153 fi 217 fi
154 fi 218 fi
155]) 219])
@@ -158,6 +222,10 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
158 LIB[]NAME= 222 LIB[]NAME=
159 LTLIB[]NAME= 223 LTLIB[]NAME=
160 INC[]NAME= 224 INC[]NAME=
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=
161 rpathdirs= 229 rpathdirs=
162 ltrpathdirs= 230 ltrpathdirs=
163 names_already_handled= 231 names_already_handled=
@@ -177,7 +245,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
177 names_already_handled="$names_already_handled $name" 245 names_already_handled="$names_already_handled $name"
178 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
179 dnl or AC_LIB_HAVE_LINKFLAGS call. 247 dnl or AC_LIB_HAVE_LINKFLAGS call.
180 uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` 248 uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
181 eval value=\"\$HAVE_LIB$uppername\" 249 eval value=\"\$HAVE_LIB$uppername\"
182 if test -n "$value"; then 250 if test -n "$value"; then
183 if test "$value" = yes; then 251 if test "$value" = yes; then
@@ -197,27 +265,53 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
197 found_la= 265 found_la=
198 found_so= 266 found_so=
199 found_a= 267 found_a=
268 eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
269 if test -n "$acl_shlibext"; then
270 shrext=".$acl_shlibext" # typically: shrext=.so
271 else
272 shrext=
273 fi
200 if test $use_additional = yes; then 274 if test $use_additional = yes; then
201 if test -n "$shlibext" \ 275 dir="$additional_libdir"
202 && { test -f "$additional_libdir/lib$name.$shlibext" \ 276 dnl The same code as in the loop below:
203 || { test "$shlibext" = dll \ 277 dnl First look for a shared library.
204 && test -f "$additional_libdir/lib$name.dll.a"; }; }; then 278 if test -n "$acl_shlibext"; then
205 found_dir="$additional_libdir" 279 if test -f "$dir/$libname$shrext"; then
206 if test -f "$additional_libdir/lib$name.$shlibext"; then 280 found_dir="$dir"
207 found_so="$additional_libdir/lib$name.$shlibext" 281 found_so="$dir/$libname$shrext"
208 else 282 else
209 found_so="$additional_libdir/lib$name.dll.a" 283 if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
284 ver=`(cd "$dir" && \
285 for f in "$libname$shrext".*; do echo "$f"; done \
286 | sed -e "s,^$libname$shrext\\\\.,," \
287 | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
288 | sed 1q ) 2>/dev/null`
289 if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
290 found_dir="$dir"
291 found_so="$dir/$libname$shrext.$ver"
292 fi
293 else
294 eval library_names=\"$acl_library_names_spec\"
295 for f in $library_names; do
296 if test -f "$dir/$f"; then
297 found_dir="$dir"
298 found_so="$dir/$f"
299 break
300 fi
301 done
302 fi
210 fi 303 fi
211 if test -f "$additional_libdir/lib$name.la"; then 304 fi
212 found_la="$additional_libdir/lib$name.la" 305 dnl Then look for a static library.
306 if test "X$found_dir" = "X"; then
307 if test -f "$dir/$libname.$acl_libext"; then
308 found_dir="$dir"
309 found_a="$dir/$libname.$acl_libext"
213 fi 310 fi
214 else 311 fi
215 if test -f "$additional_libdir/lib$name.$libext"; then 312 if test "X$found_dir" != "X"; then
216 found_dir="$additional_libdir" 313 if test -f "$dir/$libname.la"; then
217 found_a="$additional_libdir/lib$name.$libext" 314 found_la="$dir/$libname.la"
218 if test -f "$additional_libdir/lib$name.la"; then
219 found_la="$additional_libdir/lib$name.la"
220 fi
221 fi 315 fi
222 fi 316 fi
223 fi 317 fi
@@ -227,26 +321,44 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
227 case "$x" in 321 case "$x" in
228 -L*) 322 -L*)
229 dir=`echo "X$x" | sed -e 's/^X-L//'` 323 dir=`echo "X$x" | sed -e 's/^X-L//'`
230 if test -n "$shlibext" \ 324 dnl First look for a shared library.
231 && { test -f "$dir/lib$name.$shlibext" \ 325 if test -n "$acl_shlibext"; then
232 || { test "$shlibext" = dll \ 326 if test -f "$dir/$libname$shrext"; then
233 && test -f "$dir/lib$name.dll.a"; }; }; then 327 found_dir="$dir"
234 found_dir="$dir" 328 found_so="$dir/$libname$shrext"
235 if test -f "$dir/lib$name.$shlibext"; then
236 found_so="$dir/lib$name.$shlibext"
237 else 329 else
238 found_so="$dir/lib$name.dll.a" 330 if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
239 fi 331 ver=`(cd "$dir" && \
240 if test -f "$dir/lib$name.la"; then 332 for f in "$libname$shrext".*; do echo "$f"; done \
241 found_la="$dir/lib$name.la" 333 | sed -e "s,^$libname$shrext\\\\.,," \
334 | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
335 | sed 1q ) 2>/dev/null`
336 if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
337 found_dir="$dir"
338 found_so="$dir/$libname$shrext.$ver"
339 fi
340 else
341 eval library_names=\"$acl_library_names_spec\"
342 for f in $library_names; do
343 if test -f "$dir/$f"; then
344 found_dir="$dir"
345 found_so="$dir/$f"
346 break
347 fi
348 done
349 fi
242 fi 350 fi
243 else 351 fi
244 if test -f "$dir/lib$name.$libext"; then 352 dnl Then look for a static library.
353 if test "X$found_dir" = "X"; then
354 if test -f "$dir/$libname.$acl_libext"; then
245 found_dir="$dir" 355 found_dir="$dir"
246 found_a="$dir/lib$name.$libext" 356 found_a="$dir/$libname.$acl_libext"
247 if test -f "$dir/lib$name.la"; then 357 fi
248 found_la="$dir/lib$name.la" 358 fi
249 fi 359 if test "X$found_dir" != "X"; then
360 if test -f "$dir/$libname.la"; then
361 found_la="$dir/$libname.la"
250 fi 362 fi
251 fi 363 fi
252 ;; 364 ;;
@@ -263,7 +375,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
263 dnl Linking with a shared library. We attempt to hardcode its 375 dnl Linking with a shared library. We attempt to hardcode its
264 dnl directory into the executable's runpath, unless it's the 376 dnl directory into the executable's runpath, unless it's the
265 dnl standard /usr/lib. 377 dnl standard /usr/lib.
266 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
267 dnl No hardcoding is needed. 381 dnl No hardcoding is needed.
268 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" 382 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
269 else 383 else
@@ -282,12 +396,12 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
282 ltrpathdirs="$ltrpathdirs $found_dir" 396 ltrpathdirs="$ltrpathdirs $found_dir"
283 fi 397 fi
284 dnl The hardcoding into $LIBNAME is system dependent. 398 dnl The hardcoding into $LIBNAME is system dependent.
285 if test "$hardcode_direct" = yes; then 399 if test "$acl_hardcode_direct" = yes; then
286 dnl Using DIR/libNAME.so during linking hardcodes DIR into the 400 dnl Using DIR/libNAME.so during linking hardcodes DIR into the
287 dnl resulting binary. 401 dnl resulting binary.
288 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" 402 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
289 else 403 else
290 if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then 404 if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
291 dnl Use an explicit option to hardcode DIR into the resulting 405 dnl Use an explicit option to hardcode DIR into the resulting
292 dnl binary. 406 dnl binary.
293 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" 407 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
@@ -318,13 +432,13 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
318 if test -z "$haveit"; then 432 if test -z "$haveit"; then
319 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" 433 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
320 fi 434 fi
321 if test "$hardcode_minus_L" != no; then 435 if test "$acl_hardcode_minus_L" != no; then
322 dnl FIXME: Not sure whether we should use 436 dnl FIXME: Not sure whether we should use
323 dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" 437 dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
324 dnl here. 438 dnl here.
325 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" 439 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
326 else 440 else
327 dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH 441 dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
328 dnl here, because this doesn't fit in flags passed to the 442 dnl here, because this doesn't fit in flags passed to the
329 dnl compiler. So give up. No hardcoding. This affects only 443 dnl compiler. So give up. No hardcoding. This affects only
330 dnl very old systems. 444 dnl very old systems.
@@ -351,6 +465,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
351 case "$found_dir" in 465 case "$found_dir" in
352 */$acl_libdirstem | */$acl_libdirstem/) 466 */$acl_libdirstem | */$acl_libdirstem/)
353 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/"'*$,,'`
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
354 additional_includedir="$basedir/include" 478 additional_includedir="$basedir/include"
355 ;; 479 ;;
356 esac 480 esac
@@ -411,9 +535,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
411 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
412 dnl constructed $LIBNAME, 536 dnl constructed $LIBNAME,
413 dnl 4. if it doesn't exist as a directory. 537 dnl 4. if it doesn't exist as a directory.
414 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
415 haveit= 540 haveit=
416 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
417 if test -n "$GCC"; then 543 if test -n "$GCC"; then
418 case $host_os in 544 case $host_os in
419 linux* | gnu* | k*bsd*-gnu) haveit=yes;; 545 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
@@ -512,18 +638,18 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
512 done 638 done
513 done 639 done
514 if test "X$rpathdirs" != "X"; then 640 if test "X$rpathdirs" != "X"; then
515 if test -n "$hardcode_libdir_separator"; then 641 if test -n "$acl_hardcode_libdir_separator"; then
516 dnl Weird platform: only the last -rpath option counts, the user must 642 dnl Weird platform: only the last -rpath option counts, the user must
517 dnl pass all path elements in one option. We can arrange that for a 643 dnl pass all path elements in one option. We can arrange that for a
518 dnl single library, but not when more than one $LIBNAMEs are used. 644 dnl single library, but not when more than one $LIBNAMEs are used.
519 alldirs= 645 alldirs=
520 for found_dir in $rpathdirs; do 646 for found_dir in $rpathdirs; do
521 alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" 647 alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
522 done 648 done
523 dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. 649 dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
524 acl_save_libdir="$libdir" 650 acl_save_libdir="$libdir"
525 libdir="$alldirs" 651 libdir="$alldirs"
526 eval flag=\"$hardcode_libdir_flag_spec\" 652 eval flag=\"$acl_hardcode_libdir_flag_spec\"
527 libdir="$acl_save_libdir" 653 libdir="$acl_save_libdir"
528 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" 654 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
529 else 655 else
@@ -531,7 +657,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
531 for found_dir in $rpathdirs; do 657 for found_dir in $rpathdirs; do
532 acl_save_libdir="$libdir" 658 acl_save_libdir="$libdir"
533 libdir="$found_dir" 659 libdir="$found_dir"
534 eval flag=\"$hardcode_libdir_flag_spec\" 660 eval flag=\"$acl_hardcode_libdir_flag_spec\"
535 libdir="$acl_save_libdir" 661 libdir="$acl_save_libdir"
536 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" 662 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
537 done 663 done
@@ -544,6 +670,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
544 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" 670 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
545 done 671 done
546 fi 672 fi
673 popdef([P_A_C_K])
674 popdef([PACKLIBS])
675 popdef([PACKUP])
676 popdef([PACK])
677 popdef([NAME])
547]) 678])
548 679
549dnl 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,
@@ -580,7 +711,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
580 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) 711 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
581 $1= 712 $1=
582 if test "$enable_rpath" != no; then 713 if test "$enable_rpath" != no; then
583 if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then 714 if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
584 dnl Use an explicit option to hardcode directories into the resulting 715 dnl Use an explicit option to hardcode directories into the resulting
585 dnl binary. 716 dnl binary.
586 rpathdirs= 717 rpathdirs=
@@ -589,7 +720,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
589 if test -n "$next"; then 720 if test -n "$next"; then
590 dir="$next" 721 dir="$next"
591 dnl No need to hardcode the standard /usr/lib. 722 dnl No need to hardcode the standard /usr/lib.
592 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
593 rpathdirs="$rpathdirs $dir" 725 rpathdirs="$rpathdirs $dir"
594 fi 726 fi
595 next= 727 next=
@@ -598,7 +730,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
598 -L) next=yes ;; 730 -L) next=yes ;;
599 -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` 731 -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
600 dnl No need to hardcode the standard /usr/lib. 732 dnl No need to hardcode the standard /usr/lib.
601 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
602 rpathdirs="$rpathdirs $dir" 735 rpathdirs="$rpathdirs $dir"
603 fi 736 fi
604 next= ;; 737 next= ;;
@@ -614,16 +747,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
614 done 747 done
615 else 748 else
616 dnl The linker is used for linking directly. 749 dnl The linker is used for linking directly.
617 if test -n "$hardcode_libdir_separator"; then 750 if test -n "$acl_hardcode_libdir_separator"; then
618 dnl Weird platform: only the last -rpath option counts, the user 751 dnl Weird platform: only the last -rpath option counts, the user
619 dnl must pass all path elements in one option. 752 dnl must pass all path elements in one option.
620 alldirs= 753 alldirs=
621 for dir in $rpathdirs; do 754 for dir in $rpathdirs; do
622 alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$dir" 755 alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
623 done 756 done
624 acl_save_libdir="$libdir" 757 acl_save_libdir="$libdir"
625 libdir="$alldirs" 758 libdir="$alldirs"
626 eval flag=\"$hardcode_libdir_flag_spec\" 759 eval flag=\"$acl_hardcode_libdir_flag_spec\"
627 libdir="$acl_save_libdir" 760 libdir="$acl_save_libdir"
628 $1="$flag" 761 $1="$flag"
629 else 762 else
@@ -631,7 +764,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
631 for dir in $rpathdirs; do 764 for dir in $rpathdirs; do
632 acl_save_libdir="$libdir" 765 acl_save_libdir="$libdir"
633 libdir="$dir" 766 libdir="$dir"
634 eval flag=\"$hardcode_libdir_flag_spec\" 767 eval flag=\"$acl_hardcode_libdir_flag_spec\"
635 libdir="$acl_save_libdir" 768 libdir="$acl_save_libdir"
636 $1="${$1}${$1:+ }$flag" 769 $1="${$1}${$1:+ }$flag"
637 done 770 done
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index a8684e17e..31f49e40a 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/lock.m4 b/m4/lock.m4
index 0224f2ff8..73a3c54ce 100644
--- a/m4/lock.m4
+++ b/m4/lock.m4
@@ -1,311 +1,42 @@
1# lock.m4 serial 6 (gettext-0.16) 1# lock.m4 serial 13 (gettext-0.18.2)
2dnl Copyright (C) 2005-2006 Free Software Foundation, Inc. 2dnl Copyright (C) 2005-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
9dnl Tests for a multithreading library to be used. 9AC_DEFUN([gl_LOCK],
10dnl Defines at most one of the macros USE_POSIX_THREADS, USE_SOLARIS_THREADS,
11dnl USE_PTH_THREADS, USE_WIN32_THREADS
12dnl Sets the variables LIBTHREAD and LTLIBTHREAD to the linker options for use
13dnl in a Makefile (LIBTHREAD for use without libtool, LTLIBTHREAD for use with
14dnl libtool).
15dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for
16dnl programs that really need multithread functionality. The difference
17dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak
18dnl symbols, typically LIBTHREAD="" whereas LIBMULTITHREAD="-lpthread".
19dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for
20dnl multithread-safe programs.
21
22AC_DEFUN([gl_LOCK_EARLY],
23[
24 AC_REQUIRE([gl_LOCK_EARLY_BODY])
25])
26
27dnl The guts of gl_LOCK_EARLY. Needs to be expanded only once.
28
29AC_DEFUN([gl_LOCK_EARLY_BODY],
30[
31 dnl Ordering constraints: This macro modifies CPPFLAGS in a way that
32 dnl influences the result of the autoconf tests that test for *_unlocked
33 dnl declarations, on AIX 5 at least. Therefore it must come early.
34 AC_BEFORE([$0], [gl_FUNC_GLIBC_UNLOCKED_IO])dnl
35 AC_BEFORE([$0], [gl_ARGP])dnl
36
37 AC_REQUIRE([AC_CANONICAL_HOST])
38 AC_REQUIRE([AC_GNU_SOURCE]) dnl needed for pthread_rwlock_t on glibc systems
39 dnl Check for multithreading.
40 AC_ARG_ENABLE(threads,
41AC_HELP_STRING([--enable-threads={posix|solaris|pth|win32}], [specify multithreading API])
42AC_HELP_STRING([--disable-threads], [build without multithread safety]),
43 [gl_use_threads=$enableval],
44 [case "$host_os" in
45 dnl Disable multithreading by default on OSF/1, because it interferes
46 dnl with fork()/exec(): When msgexec is linked with -lpthread, its child
47 dnl process gets an endless segmentation fault inside execvp().
48 osf*) gl_use_threads=no ;;
49 *) gl_use_threads=yes ;;
50 esac
51 ])
52 if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
53 # For using <pthread.h>:
54 case "$host_os" in
55 osf*)
56 # On OSF/1, the compiler needs the flag -D_REENTRANT so that it
57 # groks <pthread.h>. cc also understands the flag -pthread, but
58 # we don't use it because 1. gcc-2.95 doesn't understand -pthread,
59 # 2. putting a flag into CPPFLAGS that has an effect on the linker
60 # causes the AC_TRY_LINK test below to succeed unexpectedly,
61 # leading to wrong values of LIBTHREAD and LTLIBTHREAD.
62 CPPFLAGS="$CPPFLAGS -D_REENTRANT"
63 ;;
64 esac
65 # Some systems optimize for single-threaded programs by default, and
66 # need special flags to disable these optimizations. For example, the
67 # definition of 'errno' in <errno.h>.
68 case "$host_os" in
69 aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;;
70 solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;;
71 esac
72 fi
73])
74
75dnl The guts of gl_LOCK. Needs to be expanded only once.
76
77AC_DEFUN([gl_LOCK_BODY],
78[ 10[
79 AC_REQUIRE([gl_LOCK_EARLY_BODY]) 11 AC_REQUIRE([gl_THREADLIB])
80 gl_threads_api=none 12 if test "$gl_threads_api" = posix; then
81 LIBTHREAD= 13 # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the
82 LTLIBTHREAD= 14 # pthread_rwlock_* functions.
83 LIBMULTITHREAD= 15 AC_CHECK_TYPE([pthread_rwlock_t],
84 LTLIBMULTITHREAD= 16 [AC_DEFINE([HAVE_PTHREAD_RWLOCK], [1],
85 if test "$gl_use_threads" != no; then 17 [Define if the POSIX multithreading library has read/write locks.])],
86 dnl Check whether the compiler and linker support weak declarations. 18 [],
87 AC_MSG_CHECKING([whether imported symbols can be declared weak]) 19 [#include <pthread.h>])
88 gl_have_weak=no 20 # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
89 AC_TRY_LINK([extern void xyzzy (); 21 AC_COMPILE_IFELSE([
90#pragma weak xyzzy], [xyzzy();], [gl_have_weak=yes]) 22 AC_LANG_PROGRAM(
91 AC_MSG_RESULT([$gl_have_weak]) 23 [[#include <pthread.h>]],
92 if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then 24 [[
93 # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that 25#if __FreeBSD__ == 4
94 # it groks <pthread.h>. It's added above, in gl_LOCK_EARLY_BODY.
95 AC_CHECK_HEADER(pthread.h, gl_have_pthread_h=yes, gl_have_pthread_h=no)
96 if test "$gl_have_pthread_h" = yes; then
97 # Other possible tests:
98 # -lpthreads (FSU threads, PCthreads)
99 # -lgthreads
100 gl_have_pthread=
101 # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist
102 # in libc. IRIX 6.5 has the first one in both libc and libpthread, but
103 # the second one only in libpthread, and lock.c needs it.
104 AC_TRY_LINK([#include <pthread.h>],
105 [pthread_mutex_lock((pthread_mutex_t*)0);
106 pthread_mutexattr_init((pthread_mutexattr_t*)0);],
107 [gl_have_pthread=yes])
108 # Test for libpthread by looking for pthread_kill. (Not pthread_self,
109 # since it is defined as a macro on OSF/1.)
110 if test -n "$gl_have_pthread"; then
111 # The program links fine without libpthread. But it may actually
112 # need to link with libpthread in order to create multiple threads.
113 AC_CHECK_LIB(pthread, pthread_kill,
114 [LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
115 # On Solaris and HP-UX, most pthread functions exist also in libc.
116 # Therefore pthread_in_use() needs to actually try to create a
117 # thread: pthread_create from libc will fail, whereas
118 # pthread_create will actually create a thread.
119 case "$host_os" in
120 solaris* | hpux*)
121 AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], 1,
122 [Define if the pthread_in_use() detection is hard.])
123 esac
124 ])
125 else
126 # Some library is needed. Try libpthread and libc_r.
127 AC_CHECK_LIB(pthread, pthread_kill,
128 [gl_have_pthread=yes
129 LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
130 LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread])
131 if test -z "$gl_have_pthread"; then
132 # For FreeBSD 4.
133 AC_CHECK_LIB(c_r, pthread_kill,
134 [gl_have_pthread=yes
135 LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r
136 LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r])
137 fi
138 fi
139 if test -n "$gl_have_pthread"; then
140 gl_threads_api=posix
141 AC_DEFINE([USE_POSIX_THREADS], 1,
142 [Define if the POSIX multithreading library can be used.])
143 if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
144 if test $gl_have_weak = yes; then
145 AC_DEFINE([USE_POSIX_THREADS_WEAK], 1,
146 [Define if references to the POSIX multithreading library should be made weak.])
147 LIBTHREAD=
148 LTLIBTHREAD=
149 fi
150 fi
151 # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the
152 # pthread_rwlock_* functions.
153 AC_CHECK_TYPE([pthread_rwlock_t],
154 [AC_DEFINE([HAVE_PTHREAD_RWLOCK], 1,
155 [Define if the POSIX multithreading library has read/write locks.])],
156 [],
157 [#include <pthread.h>])
158 # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
159 AC_TRY_COMPILE([#include <pthread.h>],
160 [#if __FreeBSD__ == 4
161error "No, in FreeBSD 4.0 recursive mutexes actually don't work." 26error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
27#elif (defined __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ \
28 && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
29error "No, in Mac OS X < 10.7 recursive mutexes actually don't work."
162#else 30#else
163int x = (int)PTHREAD_MUTEX_RECURSIVE; 31int x = (int)PTHREAD_MUTEX_RECURSIVE;
164return !x; 32return !x;
165#endif], 33#endif
166 [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE], 1, 34 ]])],
167 [Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE.])]) 35 [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE], [1],
168 fi 36 [Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE.])])
169 fi
170 fi
171 if test -z "$gl_have_pthread"; then
172 if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then
173 gl_have_solaristhread=
174 gl_save_LIBS="$LIBS"
175 LIBS="$LIBS -lthread"
176 AC_TRY_LINK([#include <thread.h>
177#include <synch.h>],
178 [thr_self();],
179 [gl_have_solaristhread=yes])
180 LIBS="$gl_save_LIBS"
181 if test -n "$gl_have_solaristhread"; then
182 gl_threads_api=solaris
183 LIBTHREAD=-lthread
184 LTLIBTHREAD=-lthread
185 LIBMULTITHREAD="$LIBTHREAD"
186 LTLIBMULTITHREAD="$LTLIBTHREAD"
187 AC_DEFINE([USE_SOLARIS_THREADS], 1,
188 [Define if the old Solaris multithreading library can be used.])
189 if test $gl_have_weak = yes; then
190 AC_DEFINE([USE_SOLARIS_THREADS_WEAK], 1,
191 [Define if references to the old Solaris multithreading library should be made weak.])
192 LIBTHREAD=
193 LTLIBTHREAD=
194 fi
195 fi
196 fi
197 fi
198 if test "$gl_use_threads" = pth; then
199 gl_save_CPPFLAGS="$CPPFLAGS"
200 AC_LIB_LINKFLAGS(pth)
201 gl_have_pth=
202 gl_save_LIBS="$LIBS"
203 LIBS="$LIBS -lpth"
204 AC_TRY_LINK([#include <pth.h>], [pth_self();], gl_have_pth=yes)
205 LIBS="$gl_save_LIBS"
206 if test -n "$gl_have_pth"; then
207 gl_threads_api=pth
208 LIBTHREAD="$LIBPTH"
209 LTLIBTHREAD="$LTLIBPTH"
210 LIBMULTITHREAD="$LIBTHREAD"
211 LTLIBMULTITHREAD="$LTLIBTHREAD"
212 AC_DEFINE([USE_PTH_THREADS], 1,
213 [Define if the GNU Pth multithreading library can be used.])
214 if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
215 if test $gl_have_weak = yes; then
216 AC_DEFINE([USE_PTH_THREADS_WEAK], 1,
217 [Define if references to the GNU Pth multithreading library should be made weak.])
218 LIBTHREAD=
219 LTLIBTHREAD=
220 fi
221 fi
222 else
223 CPPFLAGS="$gl_save_CPPFLAGS"
224 fi
225 fi
226 if test -z "$gl_have_pthread"; then
227 if test "$gl_use_threads" = yes || test "$gl_use_threads" = win32; then
228 if { case "$host_os" in
229 mingw*) true;;
230 *) false;;
231 esac
232 }; then
233 gl_threads_api=win32
234 AC_DEFINE([USE_WIN32_THREADS], 1,
235 [Define if the Win32 multithreading API can be used.])
236 fi
237 fi
238 fi
239 fi 37 fi
240 AC_MSG_CHECKING([for multithread API to use])
241 AC_MSG_RESULT([$gl_threads_api])
242 AC_SUBST(LIBTHREAD)
243 AC_SUBST(LTLIBTHREAD)
244 AC_SUBST(LIBMULTITHREAD)
245 AC_SUBST(LTLIBMULTITHREAD)
246])
247
248AC_DEFUN([gl_LOCK],
249[
250 AC_REQUIRE([gl_LOCK_EARLY])
251 AC_REQUIRE([gl_LOCK_BODY])
252 gl_PREREQ_LOCK 38 gl_PREREQ_LOCK
253]) 39])
254 40
255# Prerequisites of lib/lock.c. 41# Prerequisites of lib/glthread/lock.c.
256AC_DEFUN([gl_PREREQ_LOCK], [ 42AC_DEFUN([gl_PREREQ_LOCK], [:])
257 AC_REQUIRE([AC_C_INLINE])
258])
259
260dnl Survey of platforms:
261dnl
262dnl Platform Available Compiler Supports test-lock
263dnl flavours option weak result
264dnl --------------- --------- --------- -------- ---------
265dnl Linux 2.4/glibc posix -lpthread Y OK
266dnl
267dnl GNU Hurd/glibc posix
268dnl
269dnl FreeBSD 5.3 posix -lc_r Y
270dnl posix -lkse ? Y
271dnl posix -lpthread ? Y
272dnl posix -lthr Y
273dnl
274dnl FreeBSD 5.2 posix -lc_r Y
275dnl posix -lkse Y
276dnl posix -lthr Y
277dnl
278dnl FreeBSD 4.0,4.10 posix -lc_r Y OK
279dnl
280dnl NetBSD 1.6 --
281dnl
282dnl OpenBSD 3.4 posix -lpthread Y OK
283dnl
284dnl MacOS X 10.[123] posix -lpthread Y OK
285dnl
286dnl Solaris 7,8,9 posix -lpthread Y Sol 7,8: 0.0; Sol 9: OK
287dnl solaris -lthread Y Sol 7,8: 0.0; Sol 9: OK
288dnl
289dnl HP-UX 11 posix -lpthread N (cc) OK
290dnl Y (gcc)
291dnl
292dnl IRIX 6.5 posix -lpthread Y 0.5
293dnl
294dnl AIX 4.3,5.1 posix -lpthread N AIX 4: 0.5; AIX 5: OK
295dnl
296dnl OSF/1 4.0,5.1 posix -pthread (cc) N OK
297dnl -lpthread (gcc) Y
298dnl
299dnl Cygwin posix -lpthread Y OK
300dnl
301dnl Any of the above pth -lpth 0.0
302dnl
303dnl Mingw win32 N OK
304dnl
305dnl BeOS 5 --
306dnl
307dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is
308dnl turned off:
309dnl OK if all three tests terminate OK,
310dnl 0.5 if the first test terminates OK but the second one loops endlessly,
311dnl 0.0 if the first test already loops endlessly.
diff --git a/m4/longlong.m4 b/m4/longlong.m4
index 3716c09f6..eefb37c45 100644
--- a/m4/longlong.m4
+++ b/m4/longlong.m4
@@ -1,5 +1,5 @@
1# longlong.m4 serial 8 1# longlong.m4 serial 17
2dnl Copyright (C) 1999-2006 Free Software Foundation, Inc. 2dnl Copyright (C) 1999-2007, 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.
@@ -7,42 +7,107 @@ dnl with or without modifications, as long as this notice is preserved.
7dnl From Paul Eggert. 7dnl From Paul Eggert.
8 8
9# Define HAVE_LONG_LONG_INT if 'long long int' works. 9# Define HAVE_LONG_LONG_INT if 'long long int' works.
10# This fixes a bug in Autoconf 2.60, but can be removed once we 10# This fixes a bug in Autoconf 2.61, and can be faster
11# assume 2.61 everywhere. 11# than what's in Autoconf 2.62 through 2.68.
12 12
13# Note: If the type 'long long int' exists but is only 32 bits large 13# Note: If the type 'long long int' exists but is only 32 bits large
14# (as on some very old compilers), AC_TYPE_LONG_LONG_INT will not be 14# (as on some very old compilers), HAVE_LONG_LONG_INT will not be
15# defined. In this case you can treat 'long long int' like 'long int'. 15# defined. In this case you can treat 'long long int' like 'long int'.
16 16
17AC_DEFUN([AC_TYPE_LONG_LONG_INT], 17AC_DEFUN([AC_TYPE_LONG_LONG_INT],
18[ 18[
19 AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
19 AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int], 20 AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int],
20 [AC_LINK_IFELSE( 21 [ac_cv_type_long_long_int=yes
21 [AC_LANG_PROGRAM( 22 if test "x${ac_cv_prog_cc_c99-no}" = xno; then
22 [[long long int ll = 9223372036854775807ll; 23 ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int
23 long long int nll = -9223372036854775807LL; 24 if test $ac_cv_type_long_long_int = yes; then
24 typedef int a[((-9223372036854775807LL < 0 25 dnl Catch a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004.
25 && 0 < 9223372036854775807ll) 26 dnl If cross compiling, assume the bug is not important, since
26 ? 1 : -1)]; 27 dnl nobody cross compiles for this platform as far as we know.
27 int i = 63;]], 28 AC_RUN_IFELSE(
28 [[long long int llmax = 9223372036854775807ll; 29 [AC_LANG_PROGRAM(
29 return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) 30 [[@%:@include <limits.h>
30 | (llmax / ll) | (llmax % ll));]])], 31 @%:@ifndef LLONG_MAX
31 [ac_cv_type_long_long_int=yes], 32 @%:@ define HALF \
32 [ac_cv_type_long_long_int=no])]) 33 (1LL << (sizeof (long long int) * CHAR_BIT - 2))
34 @%:@ define LLONG_MAX (HALF - 1 + HALF)
35 @%:@endif]],
36 [[long long int n = 1;
37 int i;
38 for (i = 0; ; i++)
39 {
40 long long int m = n << i;
41 if (m >> i != n)
42 return 1;
43 if (LLONG_MAX / 2 < m)
44 break;
45 }
46 return 0;]])],
47 [],
48 [ac_cv_type_long_long_int=no],
49 [:])
50 fi
51 fi])
33 if test $ac_cv_type_long_long_int = yes; then 52 if test $ac_cv_type_long_long_int = yes; then
34 AC_DEFINE([HAVE_LONG_LONG_INT], 1, 53 AC_DEFINE([HAVE_LONG_LONG_INT], [1],
35 [Define to 1 if the system has the type `long long int'.]) 54 [Define to 1 if the system has the type 'long long int'.])
36 fi 55 fi
37]) 56])
38 57
39# This macro is obsolescent and should go away soon. 58# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
40AC_DEFUN([gl_AC_TYPE_LONG_LONG], 59# This fixes a bug in Autoconf 2.61, and can be faster
60# than what's in Autoconf 2.62 through 2.68.
61
62# Note: If the type 'unsigned long long int' exists but is only 32 bits
63# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
64# will not be defined. In this case you can treat 'unsigned long long int'
65# like 'unsigned long int'.
66
67AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
41[ 68[
42 AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) 69 AC_CACHE_CHECK([for unsigned long long int],
43 ac_cv_type_long_long=$ac_cv_type_long_long_int 70 [ac_cv_type_unsigned_long_long_int],
44 if test $ac_cv_type_long_long = yes; then 71 [ac_cv_type_unsigned_long_long_int=yes
45 AC_DEFINE(HAVE_LONG_LONG, 1, 72 if test "x${ac_cv_prog_cc_c99-no}" = xno; then
46 [Define if you have the 'long long' type.]) 73 AC_LINK_IFELSE(
74 [_AC_TYPE_LONG_LONG_SNIPPET],
75 [],
76 [ac_cv_type_unsigned_long_long_int=no])
77 fi])
78 if test $ac_cv_type_unsigned_long_long_int = yes; then
79 AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1],
80 [Define to 1 if the system has the type 'unsigned long long int'.])
47 fi 81 fi
48]) 82])
83
84# Expands to a C program that can be used to test for simultaneous support
85# of 'long long' and 'unsigned long long'. We don't want to say that
86# 'long long' is available if 'unsigned long long' is not, or vice versa,
87# because too many programs rely on the symmetry between signed and unsigned
88# integer types (excluding 'bool').
89AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET],
90[
91 AC_LANG_PROGRAM(
92 [[/* For now, do not test the preprocessor; as of 2007 there are too many
93 implementations with broken preprocessors. Perhaps this can
94 be revisited in 2012. In the meantime, code should not expect
95 #if to work with literals wider than 32 bits. */
96 /* Test literals. */
97 long long int ll = 9223372036854775807ll;
98 long long int nll = -9223372036854775807LL;
99 unsigned long long int ull = 18446744073709551615ULL;
100 /* Test constant expressions. */
101 typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
102 ? 1 : -1)];
103 typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
104 ? 1 : -1)];
105 int i = 63;]],
106 [[/* Test availability of runtime routines for shift and division. */
107 long long int llmax = 9223372036854775807ll;
108 unsigned long long int ullmax = 18446744073709551615ull;
109 return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
110 | (llmax / ll) | (llmax % ll)
111 | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
112 | (ullmax / ull) | (ullmax % ull));]])
113])
diff --git a/m4/nls.m4 b/m4/nls.m4
index 7967cc2f9..53cdc8be8 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/printf-posix.m4 b/m4/printf-posix.m4
index af10170af..3be95c130 100644
--- a/m4/printf-posix.m4
+++ b/m4/printf-posix.m4
@@ -1,5 +1,5 @@
1# printf-posix.m4 serial 2 (gettext-0.13.1) 1# printf-posix.m4 serial 6 (gettext-0.18.2)
2dnl Copyright (C) 2003 Free Software Foundation, Inc. 2dnl Copyright (C) 2003, 2007, 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.
@@ -14,7 +14,8 @@ AC_DEFUN([gt_PRINTF_POSIX],
14 AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings], 14 AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings],
15 gt_cv_func_printf_posix, 15 gt_cv_func_printf_posix,
16 [ 16 [
17 AC_TRY_RUN([ 17 AC_RUN_IFELSE(
18 [AC_LANG_SOURCE([[
18#include <stdio.h> 19#include <stdio.h>
19#include <string.h> 20#include <string.h>
20/* The string "%2$d %1$d", with dollar characters protected from the shell's 21/* The string "%2$d %1$d", with dollar characters protected from the shell's
@@ -25,19 +26,22 @@ int main ()
25{ 26{
26 sprintf (buf, format, 33, 55); 27 sprintf (buf, format, 33, 55);
27 return (strcmp (buf, "55 33") != 0); 28 return (strcmp (buf, "55 33") != 0);
28}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no, 29}]])],
29 [ 30 [gt_cv_func_printf_posix=yes],
30 AC_EGREP_CPP(notposix, [ 31 [gt_cv_func_printf_posix=no],
31#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__ 32 [
33 AC_EGREP_CPP([notposix], [
34#if defined __NetBSD__ || defined __BEOS__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
32 notposix 35 notposix
33#endif 36#endif
34 ], gt_cv_func_printf_posix="guessing no", 37 ],
35 gt_cv_func_printf_posix="guessing yes") 38 [gt_cv_func_printf_posix="guessing no"],
36 ]) 39 [gt_cv_func_printf_posix="guessing yes"])
40 ])
37 ]) 41 ])
38 case $gt_cv_func_printf_posix in 42 case $gt_cv_func_printf_posix in
39 *yes) 43 *yes)
40 AC_DEFINE(HAVE_POSIX_PRINTF, 1, 44 AC_DEFINE([HAVE_POSIX_PRINTF], [1],
41 [Define if your printf() function supports format strings with positions.]) 45 [Define if your printf() function supports format strings with positions.])
42 ;; 46 ;;
43 esac 47 esac
diff --git a/m4/progtest.m4 b/m4/progtest.m4
index a56365cd3..b499f79cf 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/m4/size_max.m4 b/m4/size_max.m4
index bfba811eb..7e192d5e9 100644
--- a/m4/size_max.m4
+++ b/m4/size_max.m4
@@ -1,5 +1,5 @@
1# size_max.m4 serial 5 1# size_max.m4 serial 10
2dnl Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc. 2dnl Copyright (C) 2003, 2005-2006, 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.
@@ -8,10 +8,9 @@ dnl From Bruno Haible.
8 8
9AC_DEFUN([gl_SIZE_MAX], 9AC_DEFUN([gl_SIZE_MAX],
10[ 10[
11 AC_CHECK_HEADERS(stdint.h) 11 AC_CHECK_HEADERS([stdint.h])
12 dnl First test whether the system already has SIZE_MAX. 12 dnl First test whether the system already has SIZE_MAX.
13 AC_MSG_CHECKING([for SIZE_MAX]) 13 AC_CACHE_CHECK([for SIZE_MAX], [gl_cv_size_max], [
14 AC_CACHE_VAL([gl_cv_size_max], [
15 gl_cv_size_max= 14 gl_cv_size_max=
16 AC_EGREP_CPP([Found it], [ 15 AC_EGREP_CPP([Found it], [
17#include <limits.h> 16#include <limits.h>
@@ -21,24 +20,28 @@ AC_DEFUN([gl_SIZE_MAX],
21#ifdef SIZE_MAX 20#ifdef SIZE_MAX
22Found it 21Found it
23#endif 22#endif
24], gl_cv_size_max=yes) 23], [gl_cv_size_max=yes])
25 if test -z "$gl_cv_size_max"; then 24 if test -z "$gl_cv_size_max"; then
26 dnl Define it ourselves. Here we assume that the type 'size_t' is not wider 25 dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
27 dnl than the type 'unsigned long'. Try hard to find a definition that can 26 dnl than the type 'unsigned long'. Try hard to find a definition that can
28 dnl be used in a preprocessor #if, i.e. doesn't contain a cast. 27 dnl be used in a preprocessor #if, i.e. doesn't contain a cast.
29 _AC_COMPUTE_INT([sizeof (size_t) * CHAR_BIT - 1], size_t_bits_minus_1, 28 AC_COMPUTE_INT([size_t_bits_minus_1], [sizeof (size_t) * CHAR_BIT - 1],
30 [#include <stddef.h> 29 [#include <stddef.h>
31#include <limits.h>], size_t_bits_minus_1=) 30#include <limits.h>], [size_t_bits_minus_1=])
32 _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint, 31 AC_COMPUTE_INT([fits_in_uint], [sizeof (size_t) <= sizeof (unsigned int)],
33 [#include <stddef.h>], fits_in_uint=) 32 [#include <stddef.h>], [fits_in_uint=])
34 if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then 33 if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
35 if test $fits_in_uint = 1; then 34 if test $fits_in_uint = 1; then
36 dnl Even though SIZE_MAX fits in an unsigned int, it must be of type 35 dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
37 dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'. 36 dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
38 AC_TRY_COMPILE([#include <stddef.h> 37 AC_COMPILE_IFELSE(
39 extern size_t foo; 38 [AC_LANG_PROGRAM(
40 extern unsigned long foo; 39 [[#include <stddef.h>
41 ], [], fits_in_uint=0) 40 extern size_t foo;
41 extern unsigned long foo;
42 ]],
43 [[]])],
44 [fits_in_uint=0])
42 fi 45 fi
43 dnl We cannot use 'expr' to simplify this expression, because 'expr' 46 dnl We cannot use 'expr' to simplify this expression, because 'expr'
44 dnl works only with 'long' integers in the host environment, while we 47 dnl works only with 'long' integers in the host environment, while we
@@ -54,9 +57,23 @@ Found it
54 fi 57 fi
55 fi 58 fi
56 ]) 59 ])
57 AC_MSG_RESULT([$gl_cv_size_max])
58 if test "$gl_cv_size_max" != yes; then 60 if test "$gl_cv_size_max" != yes; then
59 AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max], 61 AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max],
60 [Define as the maximum value of type 'size_t', if the system doesn't define it.]) 62 [Define as the maximum value of type 'size_t', if the system doesn't define it.])
61 fi 63 fi
64 dnl Don't redefine SIZE_MAX in config.h if config.h is re-included after
65 dnl <stdint.h>. Remember that the #undef in AH_VERBATIM gets replaced with
66 dnl #define by AC_DEFINE_UNQUOTED.
67 AH_VERBATIM([SIZE_MAX],
68[/* Define as the maximum value of type 'size_t', if the system doesn't define
69 it. */
70#ifndef SIZE_MAX
71# undef SIZE_MAX
72#endif])
73])
74
75dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in.
76dnl Remove this when we can assume autoconf >= 2.61.
77m4_ifdef([AC_COMPUTE_INT], [], [
78 AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])])
62]) 79])
diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4
index db9a8ac4c..7fc2ce9a8 100644
--- a/m4/stdint_h.m4
+++ b/m4/stdint_h.m4
@@ -1,5 +1,5 @@
1# stdint_h.m4 serial 6 1# stdint_h.m4 serial 9
2dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc. 2dnl Copyright (C) 1997-2004, 2006, 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.
@@ -11,15 +11,16 @@ dnl From Paul Eggert.
11 11
12AC_DEFUN([gl_AC_HEADER_STDINT_H], 12AC_DEFUN([gl_AC_HEADER_STDINT_H],
13[ 13[
14 AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h, 14 AC_CACHE_CHECK([for stdint.h], [gl_cv_header_stdint_h],
15 [AC_TRY_COMPILE( 15 [AC_COMPILE_IFELSE(
16 [#include <sys/types.h> 16 [AC_LANG_PROGRAM(
17#include <stdint.h>], 17 [[#include <sys/types.h>
18 [uintmax_t i = (uintmax_t) -1; return !i;], 18 #include <stdint.h>]],
19 gl_cv_header_stdint_h=yes, 19 [[uintmax_t i = (uintmax_t) -1; return !i;]])],
20 gl_cv_header_stdint_h=no)]) 20 [gl_cv_header_stdint_h=yes],
21 [gl_cv_header_stdint_h=no])])
21 if test $gl_cv_header_stdint_h = yes; then 22 if test $gl_cv_header_stdint_h = yes; then
22 AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, 23 AC_DEFINE_UNQUOTED([HAVE_STDINT_H_WITH_UINTMAX], [1],
23 [Define if <stdint.h> exists, doesn't clash with <sys/types.h>, 24 [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
24 and declares uintmax_t. ]) 25 and declares uintmax_t. ])
25 fi 26 fi
diff --git a/m4/threadlib.m4 b/m4/threadlib.m4
new file mode 100644
index 000000000..dc9a3d8e8
--- /dev/null
+++ b/m4/threadlib.m4
@@ -0,0 +1,389 @@
1# threadlib.m4 serial 11 (gettext-0.18.2)
2dnl Copyright (C) 2005-2014 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6
7dnl From Bruno Haible.
8
9dnl gl_THREADLIB
10dnl ------------
11dnl Tests for a multithreading library to be used.
12dnl If the configure.ac contains a definition of the gl_THREADLIB_DEFAULT_NO
13dnl (it must be placed before the invocation of gl_THREADLIB_EARLY!), then the
14dnl default is 'no', otherwise it is system dependent. In both cases, the user
15dnl can change the choice through the options --enable-threads=choice or
16dnl --disable-threads.
17dnl Defines at most one of the macros USE_POSIX_THREADS, USE_SOLARIS_THREADS,
18dnl USE_PTH_THREADS, USE_WINDOWS_THREADS
19dnl Sets the variables LIBTHREAD and LTLIBTHREAD to the linker options for use
20dnl in a Makefile (LIBTHREAD for use without libtool, LTLIBTHREAD for use with
21dnl libtool).
22dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for
23dnl programs that really need multithread functionality. The difference
24dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak
25dnl symbols, typically LIBTHREAD is empty whereas LIBMULTITHREAD is not.
26dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for
27dnl multithread-safe programs.
28
29AC_DEFUN([gl_THREADLIB_EARLY],
30[
31 AC_REQUIRE([gl_THREADLIB_EARLY_BODY])
32])
33
34dnl The guts of gl_THREADLIB_EARLY. Needs to be expanded only once.
35
36AC_DEFUN([gl_THREADLIB_EARLY_BODY],
37[
38 dnl Ordering constraints: This macro modifies CPPFLAGS in a way that
39 dnl influences the result of the autoconf tests that test for *_unlocked
40 dnl declarations, on AIX 5 at least. Therefore it must come early.
41 AC_BEFORE([$0], [gl_FUNC_GLIBC_UNLOCKED_IO])dnl
42 AC_BEFORE([$0], [gl_ARGP])dnl
43
44 AC_REQUIRE([AC_CANONICAL_HOST])
45 dnl _GNU_SOURCE is needed for pthread_rwlock_t on glibc systems.
46 dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes
47 dnl AC_GNU_SOURCE.
48 m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
49 [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])],
50 [AC_REQUIRE([AC_GNU_SOURCE])])
51 dnl Check for multithreading.
52 m4_ifdef([gl_THREADLIB_DEFAULT_NO],
53 [m4_divert_text([DEFAULTS], [gl_use_threads_default=no])],
54 [m4_divert_text([DEFAULTS], [gl_use_threads_default=])])
55 AC_ARG_ENABLE([threads],
56AC_HELP_STRING([--enable-threads={posix|solaris|pth|windows}], [specify multithreading API])m4_ifdef([gl_THREADLIB_DEFAULT_NO], [], [
57AC_HELP_STRING([--disable-threads], [build without multithread safety])]),
58 [gl_use_threads=$enableval],
59 [if test -n "$gl_use_threads_default"; then
60 gl_use_threads="$gl_use_threads_default"
61 else
62changequote(,)dnl
63 case "$host_os" in
64 dnl Disable multithreading by default on OSF/1, because it interferes
65 dnl with fork()/exec(): When msgexec is linked with -lpthread, its
66 dnl child process gets an endless segmentation fault inside execvp().
67 dnl Disable multithreading by default on Cygwin 1.5.x, because it has
68 dnl bugs that lead to endless loops or crashes. See
69 dnl <http://cygwin.com/ml/cygwin/2009-08/msg00283.html>.
70 osf*) gl_use_threads=no ;;
71 cygwin*)
72 case `uname -r` in
73 1.[0-5].*) gl_use_threads=no ;;
74 *) gl_use_threads=yes ;;
75 esac
76 ;;
77 *) gl_use_threads=yes ;;
78 esac
79changequote([,])dnl
80 fi
81 ])
82 if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
83 # For using <pthread.h>:
84 case "$host_os" in
85 osf*)
86 # On OSF/1, the compiler needs the flag -D_REENTRANT so that it
87 # groks <pthread.h>. cc also understands the flag -pthread, but
88 # we don't use it because 1. gcc-2.95 doesn't understand -pthread,
89 # 2. putting a flag into CPPFLAGS that has an effect on the linker
90 # causes the AC_LINK_IFELSE test below to succeed unexpectedly,
91 # leading to wrong values of LIBTHREAD and LTLIBTHREAD.
92 CPPFLAGS="$CPPFLAGS -D_REENTRANT"
93 ;;
94 esac
95 # Some systems optimize for single-threaded programs by default, and
96 # need special flags to disable these optimizations. For example, the
97 # definition of 'errno' in <errno.h>.
98 case "$host_os" in
99 aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;;
100 solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;;
101 esac
102 fi
103])
104
105dnl The guts of gl_THREADLIB. Needs to be expanded only once.
106
107AC_DEFUN([gl_THREADLIB_BODY],
108[
109 AC_REQUIRE([gl_THREADLIB_EARLY_BODY])
110 gl_threads_api=none
111 LIBTHREAD=
112 LTLIBTHREAD=
113 LIBMULTITHREAD=
114 LTLIBMULTITHREAD=
115 if test "$gl_use_threads" != no; then
116 dnl Check whether the compiler and linker support weak declarations.
117 AC_CACHE_CHECK([whether imported symbols can be declared weak],
118 [gl_cv_have_weak],
119 [gl_cv_have_weak=no
120 dnl First, test whether the compiler accepts it syntactically.
121 AC_LINK_IFELSE(
122 [AC_LANG_PROGRAM(
123 [[extern void xyzzy ();
124#pragma weak xyzzy]],
125 [[xyzzy();]])],
126 [gl_cv_have_weak=maybe])
127 if test $gl_cv_have_weak = maybe; then
128 dnl Second, test whether it actually works. On Cygwin 1.7.2, with
129 dnl gcc 4.3, symbols declared weak always evaluate to the address 0.
130 AC_RUN_IFELSE(
131 [AC_LANG_SOURCE([[
132#include <stdio.h>
133#pragma weak fputs
134int main ()
135{
136 return (fputs == NULL);
137}]])],
138 [gl_cv_have_weak=yes],
139 [gl_cv_have_weak=no],
140 [dnl When cross-compiling, assume that only ELF platforms support
141 dnl weak symbols.
142 AC_EGREP_CPP([Extensible Linking Format],
143 [#ifdef __ELF__
144 Extensible Linking Format
145 #endif
146 ],
147 [gl_cv_have_weak="guessing yes"],
148 [gl_cv_have_weak="guessing no"])
149 ])
150 fi
151 ])
152 if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
153 # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
154 # it groks <pthread.h>. It's added above, in gl_THREADLIB_EARLY_BODY.
155 AC_CHECK_HEADER([pthread.h],
156 [gl_have_pthread_h=yes], [gl_have_pthread_h=no])
157 if test "$gl_have_pthread_h" = yes; then
158 # Other possible tests:
159 # -lpthreads (FSU threads, PCthreads)
160 # -lgthreads
161 gl_have_pthread=
162 # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist
163 # in libc. IRIX 6.5 has the first one in both libc and libpthread, but
164 # the second one only in libpthread, and lock.c needs it.
165 #
166 # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04
167 # needs -pthread for some reason. See:
168 # http://lists.gnu.org/archive/html/bug-gnulib/2014-09/msg00023.html
169 save_LIBS=$LIBS
170 for gl_pthread in '' '-pthread'; do
171 LIBS="$LIBS $gl_pthread"
172 AC_LINK_IFELSE(
173 [AC_LANG_PROGRAM(
174 [[#include <pthread.h>
175 pthread_mutex_t m;
176 pthread_mutexattr_t ma;
177 ]],
178 [[pthread_mutex_lock (&m);
179 pthread_mutexattr_init (&ma);]])],
180 [gl_have_pthread=yes
181 LIBTHREAD=$gl_pthread LTLIBTHREAD=$gl_pthread
182 LIBMULTITHREAD=$gl_pthread LTLIBMULTITHREAD=$gl_pthread])
183 LIBS=$save_LIBS
184 test -n "$gl_have_pthread" && break
185 done
186
187 # Test for libpthread by looking for pthread_kill. (Not pthread_self,
188 # since it is defined as a macro on OSF/1.)
189 if test -n "$gl_have_pthread" && test -z "$LIBTHREAD"; then
190 # The program links fine without libpthread. But it may actually
191 # need to link with libpthread in order to create multiple threads.
192 AC_CHECK_LIB([pthread], [pthread_kill],
193 [LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
194 # On Solaris and HP-UX, most pthread functions exist also in libc.
195 # Therefore pthread_in_use() needs to actually try to create a
196 # thread: pthread_create from libc will fail, whereas
197 # pthread_create will actually create a thread.
198 case "$host_os" in
199 solaris* | hpux*)
200 AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1],
201 [Define if the pthread_in_use() detection is hard.])
202 esac
203 ])
204 elif test -z "$gl_have_pthread"; then
205 # Some library is needed. Try libpthread and libc_r.
206 AC_CHECK_LIB([pthread], [pthread_kill],
207 [gl_have_pthread=yes
208 LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
209 LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread])
210 if test -z "$gl_have_pthread"; then
211 # For FreeBSD 4.
212 AC_CHECK_LIB([c_r], [pthread_kill],
213 [gl_have_pthread=yes
214 LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r
215 LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r])
216 fi
217 fi
218 if test -n "$gl_have_pthread"; then
219 gl_threads_api=posix
220 AC_DEFINE([USE_POSIX_THREADS], [1],
221 [Define if the POSIX multithreading library can be used.])
222 if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
223 if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
224 AC_DEFINE([USE_POSIX_THREADS_WEAK], [1],
225 [Define if references to the POSIX multithreading library should be made weak.])
226 LIBTHREAD=
227 LTLIBTHREAD=
228 fi
229 fi
230 fi
231 fi
232 fi
233 if test -z "$gl_have_pthread"; then
234 if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then
235 gl_have_solaristhread=
236 gl_save_LIBS="$LIBS"
237 LIBS="$LIBS -lthread"
238 AC_LINK_IFELSE(
239 [AC_LANG_PROGRAM(
240 [[
241#include <thread.h>
242#include <synch.h>
243 ]],
244 [[thr_self();]])],
245 [gl_have_solaristhread=yes])
246 LIBS="$gl_save_LIBS"
247 if test -n "$gl_have_solaristhread"; then
248 gl_threads_api=solaris
249 LIBTHREAD=-lthread
250 LTLIBTHREAD=-lthread
251 LIBMULTITHREAD="$LIBTHREAD"
252 LTLIBMULTITHREAD="$LTLIBTHREAD"
253 AC_DEFINE([USE_SOLARIS_THREADS], [1],
254 [Define if the old Solaris multithreading library can be used.])
255 if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
256 AC_DEFINE([USE_SOLARIS_THREADS_WEAK], [1],
257 [Define if references to the old Solaris multithreading library should be made weak.])
258 LIBTHREAD=
259 LTLIBTHREAD=
260 fi
261 fi
262 fi
263 fi
264 if test "$gl_use_threads" = pth; then
265 gl_save_CPPFLAGS="$CPPFLAGS"
266 AC_LIB_LINKFLAGS([pth])
267 gl_have_pth=
268 gl_save_LIBS="$LIBS"
269 LIBS="$LIBS $LIBPTH"
270 AC_LINK_IFELSE(
271 [AC_LANG_PROGRAM([[#include <pth.h>]], [[pth_self();]])],
272 [gl_have_pth=yes])
273 LIBS="$gl_save_LIBS"
274 if test -n "$gl_have_pth"; then
275 gl_threads_api=pth
276 LIBTHREAD="$LIBPTH"
277 LTLIBTHREAD="$LTLIBPTH"
278 LIBMULTITHREAD="$LIBTHREAD"
279 LTLIBMULTITHREAD="$LTLIBTHREAD"
280 AC_DEFINE([USE_PTH_THREADS], [1],
281 [Define if the GNU Pth multithreading library can be used.])
282 if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
283 if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
284 AC_DEFINE([USE_PTH_THREADS_WEAK], [1],
285 [Define if references to the GNU Pth multithreading library should be made weak.])
286 LIBTHREAD=
287 LTLIBTHREAD=
288 fi
289 fi
290 else
291 CPPFLAGS="$gl_save_CPPFLAGS"
292 fi
293 fi
294 if test -z "$gl_have_pthread"; then
295 case "$gl_use_threads" in
296 yes | windows | win32) # The 'win32' is for backward compatibility.
297 if { case "$host_os" in
298 mingw*) true;;
299 *) false;;
300 esac
301 }; then
302 gl_threads_api=windows
303 AC_DEFINE([USE_WINDOWS_THREADS], [1],
304 [Define if the native Windows multithreading API can be used.])
305 fi
306 ;;
307 esac
308 fi
309 fi
310 AC_MSG_CHECKING([for multithread API to use])
311 AC_MSG_RESULT([$gl_threads_api])
312 AC_SUBST([LIBTHREAD])
313 AC_SUBST([LTLIBTHREAD])
314 AC_SUBST([LIBMULTITHREAD])
315 AC_SUBST([LTLIBMULTITHREAD])
316])
317
318AC_DEFUN([gl_THREADLIB],
319[
320 AC_REQUIRE([gl_THREADLIB_EARLY])
321 AC_REQUIRE([gl_THREADLIB_BODY])
322])
323
324
325dnl gl_DISABLE_THREADS
326dnl ------------------
327dnl Sets the gl_THREADLIB default so that threads are not used by default.
328dnl The user can still override it at installation time, by using the
329dnl configure option '--enable-threads'.
330
331AC_DEFUN([gl_DISABLE_THREADS], [
332 m4_divert_text([INIT_PREPARE], [gl_use_threads_default=no])
333])
334
335
336dnl Survey of platforms:
337dnl
338dnl Platform Available Compiler Supports test-lock
339dnl flavours option weak result
340dnl --------------- --------- --------- -------- ---------
341dnl Linux 2.4/glibc posix -lpthread Y OK
342dnl
343dnl GNU Hurd/glibc posix
344dnl
345dnl Ubuntu 14.04 posix -pthread Y OK
346dnl
347dnl FreeBSD 5.3 posix -lc_r Y
348dnl posix -lkse ? Y
349dnl posix -lpthread ? Y
350dnl posix -lthr Y
351dnl
352dnl FreeBSD 5.2 posix -lc_r Y
353dnl posix -lkse Y
354dnl posix -lthr Y
355dnl
356dnl FreeBSD 4.0,4.10 posix -lc_r Y OK
357dnl
358dnl NetBSD 1.6 --
359dnl
360dnl OpenBSD 3.4 posix -lpthread Y OK
361dnl
362dnl Mac OS X 10.[123] posix -lpthread Y OK
363dnl
364dnl Solaris 7,8,9 posix -lpthread Y Sol 7,8: 0.0; Sol 9: OK
365dnl solaris -lthread Y Sol 7,8: 0.0; Sol 9: OK
366dnl
367dnl HP-UX 11 posix -lpthread N (cc) OK
368dnl Y (gcc)
369dnl
370dnl IRIX 6.5 posix -lpthread Y 0.5
371dnl
372dnl AIX 4.3,5.1 posix -lpthread N AIX 4: 0.5; AIX 5: OK
373dnl
374dnl OSF/1 4.0,5.1 posix -pthread (cc) N OK
375dnl -lpthread (gcc) Y
376dnl
377dnl Cygwin posix -lpthread Y OK
378dnl
379dnl Any of the above pth -lpth 0.0
380dnl
381dnl Mingw windows N OK
382dnl
383dnl BeOS 5 --
384dnl
385dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is
386dnl turned off:
387dnl OK if all three tests terminate OK,
388dnl 0.5 if the first test terminates OK but the second one loops endlessly,
389dnl 0.0 if the first test already loops endlessly.
diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4
index bf83ed746..0a94f17fb 100644
--- a/m4/uintmax_t.m4
+++ b/m4/uintmax_t.m4
@@ -1,12 +1,12 @@
1# uintmax_t.m4 serial 9 1# uintmax_t.m4 serial 12
2dnl Copyright (C) 1997-2004 Free Software Foundation, Inc. 2dnl Copyright (C) 1997-2004, 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.
6 6
7dnl From Paul Eggert. 7dnl From Paul Eggert.
8 8
9AC_PREREQ(2.13) 9AC_PREREQ([2.13])
10 10
11# Define uintmax_t to 'unsigned long' or 'unsigned long long' 11# Define uintmax_t to 'unsigned long' or 'unsigned long long'
12# if it is not already defined in <stdint.h> or <inttypes.h>. 12# if it is not already defined in <stdint.h> or <inttypes.h>.
@@ -16,15 +16,15 @@ AC_DEFUN([gl_AC_TYPE_UINTMAX_T],
16 AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) 16 AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
17 AC_REQUIRE([gl_AC_HEADER_STDINT_H]) 17 AC_REQUIRE([gl_AC_HEADER_STDINT_H])
18 if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then 18 if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
19 AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG]) 19 AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
20 test $ac_cv_type_unsigned_long_long = yes \ 20 test $ac_cv_type_unsigned_long_long_int = yes \
21 && ac_type='unsigned long long' \ 21 && ac_type='unsigned long long' \
22 || ac_type='unsigned long' 22 || ac_type='unsigned long'
23 AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, 23 AC_DEFINE_UNQUOTED([uintmax_t], [$ac_type],
24 [Define to unsigned long or unsigned long long 24 [Define to unsigned long or unsigned long long
25 if <stdint.h> and <inttypes.h> don't define.]) 25 if <stdint.h> and <inttypes.h> don't define.])
26 else 26 else
27 AC_DEFINE(HAVE_UINTMAX_T, 1, 27 AC_DEFINE([HAVE_UINTMAX_T], [1],
28 [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.]) 28 [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
29 fi 29 fi
30]) 30])
diff --git a/m4/visibility.m4 b/m4/visibility.m4
index 2ff6330aa..552e39772 100644
--- a/m4/visibility.m4
+++ b/m4/visibility.m4
@@ -1,5 +1,5 @@
1# visibility.m4 serial 1 (gettext-0.15) 1# visibility.m4 serial 5 (gettext-0.18.2)
2dnl Copyright (C) 2005 Free Software Foundation, Inc. 2dnl Copyright (C) 2005, 2008, 2010-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.
@@ -12,7 +12,7 @@ dnl __attribute__((__visibility__("hidden"))) and
12dnl __attribute__((__visibility__("default"))). 12dnl __attribute__((__visibility__("default"))).
13dnl Does *not* test for __visibility__("protected") - which has tricky 13dnl Does *not* test for __visibility__("protected") - which has tricky
14dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on 14dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
15dnl MacOS X. 15dnl Mac OS X.
16dnl Does *not* test for __visibility__("internal") - which has processor 16dnl Does *not* test for __visibility__("internal") - which has processor
17dnl dependent semantics. 17dnl dependent semantics.
18dnl Does *not* test for #pragma GCC visibility push(hidden) - which is 18dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
@@ -26,18 +26,43 @@ AC_DEFUN([gl_VISIBILITY],
26 CFLAG_VISIBILITY= 26 CFLAG_VISIBILITY=
27 HAVE_VISIBILITY=0 27 HAVE_VISIBILITY=0
28 if test -n "$GCC"; then 28 if test -n "$GCC"; then
29 dnl First, check whether -Werror can be added to the command line, or
30 dnl whether it leads to an error because of some other option that the
31 dnl user has put into $CC $CFLAGS $CPPFLAGS.
32 AC_MSG_CHECKING([whether the -Werror option is usable])
33 AC_CACHE_VAL([gl_cv_cc_vis_werror], [
34 gl_save_CFLAGS="$CFLAGS"
35 CFLAGS="$CFLAGS -Werror"
36 AC_COMPILE_IFELSE(
37 [AC_LANG_PROGRAM([[]], [[]])],
38 [gl_cv_cc_vis_werror=yes],
39 [gl_cv_cc_vis_werror=no])
40 CFLAGS="$gl_save_CFLAGS"])
41 AC_MSG_RESULT([$gl_cv_cc_vis_werror])
42 dnl Now check whether visibility declarations are supported.
29 AC_MSG_CHECKING([for simple visibility declarations]) 43 AC_MSG_CHECKING([for simple visibility declarations])
30 AC_CACHE_VAL(gl_cv_cc_visibility, [ 44 AC_CACHE_VAL([gl_cv_cc_visibility], [
31 gl_save_CFLAGS="$CFLAGS" 45 gl_save_CFLAGS="$CFLAGS"
32 CFLAGS="$CFLAGS -fvisibility=hidden" 46 CFLAGS="$CFLAGS -fvisibility=hidden"
33 AC_TRY_COMPILE( 47 dnl We use the option -Werror and a function dummyfunc, because on some
34 [extern __attribute__((__visibility__("hidden"))) int hiddenvar; 48 dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning
35 extern __attribute__((__visibility__("default"))) int exportedvar; 49 dnl "visibility attribute not supported in this configuration; ignored"
36 extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); 50 dnl at the first function definition in every compilation unit, and we
37 extern __attribute__((__visibility__("default"))) int exportedfunc (void);], 51 dnl don't want to use the option in this case.
38 [], 52 if test $gl_cv_cc_vis_werror = yes; then
39 gl_cv_cc_visibility=yes, 53 CFLAGS="$CFLAGS -Werror"
40 gl_cv_cc_visibility=no) 54 fi
55 AC_COMPILE_IFELSE(
56 [AC_LANG_PROGRAM(
57 [[extern __attribute__((__visibility__("hidden"))) int hiddenvar;
58 extern __attribute__((__visibility__("default"))) int exportedvar;
59 extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
60 extern __attribute__((__visibility__("default"))) int exportedfunc (void);
61 void dummyfunc (void) {}
62 ]],
63 [[]])],
64 [gl_cv_cc_visibility=yes],
65 [gl_cv_cc_visibility=no])
41 CFLAGS="$gl_save_CFLAGS"]) 66 CFLAGS="$gl_save_CFLAGS"])
42 AC_MSG_RESULT([$gl_cv_cc_visibility]) 67 AC_MSG_RESULT([$gl_cv_cc_visibility])
43 if test $gl_cv_cc_visibility = yes; then 68 if test $gl_cv_cc_visibility = yes; then
diff --git a/m4/wint_t.m4 b/m4/wint_t.m4
index b8fff9c86..9b07b0709 100644
--- a/m4/wint_t.m4
+++ b/m4/wint_t.m4
@@ -1,5 +1,5 @@
1# wint_t.m4 serial 1 (gettext-0.12) 1# wint_t.m4 serial 5 (gettext-0.18.2)
2dnl Copyright (C) 2003 Free Software Foundation, Inc. 2dnl Copyright (C) 2003, 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.
@@ -10,11 +10,23 @@ dnl Prerequisite: AC_PROG_CC
10 10
11AC_DEFUN([gt_TYPE_WINT_T], 11AC_DEFUN([gt_TYPE_WINT_T],
12[ 12[
13 AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t, 13 AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
14 [AC_TRY_COMPILE([#include <wchar.h> 14 [AC_COMPILE_IFELSE(
15 wint_t foo = (wchar_t)'\0';], , 15 [AC_LANG_PROGRAM(
16 gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)]) 16 [[
17/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
18 <wchar.h>.
19 BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
20 before <wchar.h>. */
21#include <stddef.h>
22#include <stdio.h>
23#include <time.h>
24#include <wchar.h>
25 wint_t foo = (wchar_t)'\0';]],
26 [[]])],
27 [gt_cv_c_wint_t=yes],
28 [gt_cv_c_wint_t=no])])
17 if test $gt_cv_c_wint_t = yes; then 29 if test $gt_cv_c_wint_t = yes; then
18 AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.]) 30 AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.])
19 fi 31 fi
20]) 32])
diff --git a/m4/xsize.m4 b/m4/xsize.m4
index 85bb721e4..3af23ec75 100644
--- a/m4/xsize.m4
+++ b/m4/xsize.m4
@@ -1,5 +1,5 @@
1# xsize.m4 serial 3 1# xsize.m4 serial 5
2dnl Copyright (C) 2003-2004 Free Software Foundation, Inc. 2dnl Copyright (C) 2003-2004, 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.
@@ -8,6 +8,5 @@ AC_DEFUN([gl_XSIZE],
8[ 8[
9 dnl Prerequisites of lib/xsize.h. 9 dnl Prerequisites of lib/xsize.h.
10 AC_REQUIRE([gl_SIZE_MAX]) 10 AC_REQUIRE([gl_SIZE_MAX])
11 AC_REQUIRE([AC_C_INLINE]) 11 AC_CHECK_HEADERS([stdint.h])
12 AC_CHECK_HEADERS(stdint.h)
13]) 12])
diff --git a/po/ChangeLog b/po/ChangeLog
index 7ff113c61..05526fb76 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
12007-02-08 gettextize <bug-gnu-gettext@gnu.org> 62007-02-08 gettextize <bug-gnu-gettext@gnu.org>
2 7
3 * Makefile.in.in: Upgrade to gettext-0.16.1. 8 * Makefile.in.in: Upgrade to gettext-0.16.1.
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 5022b8b18..65184f65c 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-2006 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,12 +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.16 11# Origin: gettext-0.19
12GETTEXT_MACRO_VERSION = 0.19
12 13
13PACKAGE = @PACKAGE@ 14PACKAGE = @PACKAGE@
14VERSION = @VERSION@ 15VERSION = @VERSION@
15PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ 16PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
16 17
18SED = @SED@
17SHELL = /bin/sh 19SHELL = /bin/sh
18@SET_MAKE@ 20@SET_MAKE@
19 21
@@ -75,6 +77,16 @@ POTFILES = \
75 77
76CATALOGS = @CATALOGS@ 78CATALOGS = @CATALOGS@
77 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
78# Makevars gets inserted here. (Don't remove this line!) 90# Makevars gets inserted here. (Don't remove this line!)
79 91
80.SUFFIXES: 92.SUFFIXES:
@@ -87,8 +99,8 @@ CATALOGS = @CATALOGS@
87.po.gmo: 99.po.gmo:
88 @lang=`echo $* | sed -e 's,.*/,,'`; \ 100 @lang=`echo $* | sed -e 's,.*/,,'`; \
89 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ 101 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
90 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"; \
91 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
92 104
93.sin.sed: 105.sin.sed:
94 sed -e '/^#/d' $< > t-$@ 106 sed -e '/^#/d' $< > t-$@
@@ -100,6 +112,13 @@ all: all-@USE_NLS@
100all-yes: stamp-po 112all-yes: stamp-po
101all-no: 113all-no:
102 114
115# Ensure that the gettext macros and this Makefile.in.in are in sync.
116CHECK_MACRO_VERSION = \
117 test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
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; \
119 exit 1; \
120 }
121
103# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no 122# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
104# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because 123# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
105# we don't want to bother translators with empty POT files). We assume that 124# we don't want to bother translators with empty POT files). We assume that
@@ -115,6 +134,7 @@ all-no:
115# $(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
116# changed. 135# changed.
117stamp-po: $(srcdir)/$(DOMAIN).pot 136stamp-po: $(srcdir)/$(DOMAIN).pot
137 @$(CHECK_MACRO_VERSION)
118 test ! -f $(srcdir)/$(DOMAIN).pot || \ 138 test ! -f $(srcdir)/$(DOMAIN).pot || \
119 test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) 139 test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
120 @test ! -f $(srcdir)/$(DOMAIN).pot || { \ 140 @test ! -f $(srcdir)/$(DOMAIN).pot || { \
@@ -129,17 +149,53 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
129 149
130# This target rebuilds $(DOMAIN).pot; it is an expensive operation. 150# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
131# 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.
132$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed 155$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
156 package_gnu="$(PACKAGE_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 '; \
173 else \
174 package_prefix=''; \
175 fi; \
133 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 \
134 msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ 177 msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
135 else \ 178 else \
136 msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \ 179 msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
137 fi; \ 180 fi; \
138 $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ 181 case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
139 --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ 182 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
140 --files-from=$(srcdir)/POTFILES.in \ 183 $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
141 --copyright-holder='$(COPYRIGHT_HOLDER)' \ 184 --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
142 --msgid-bugs-address="$$msgid_bugs_address" 185 --files-from=$(srcdir)/POTFILES.in \
186 --copyright-holder='$(COPYRIGHT_HOLDER)' \
187 --msgid-bugs-address="$$msgid_bugs_address" \
188 ;; \
189 *) \
190 $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
191 --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
192 --files-from=$(srcdir)/POTFILES.in \
193 --copyright-holder='$(COPYRIGHT_HOLDER)' \
194 --package-name="$${package_prefix}@PACKAGE@" \
195 --package-version='@VERSION@' \
196 --msgid-bugs-address="$$msgid_bugs_address" \
197 ;; \
198 esac
143 test ! -f $(DOMAIN).po || { \ 199 test ! -f $(DOMAIN).po || { \
144 if test -f $(srcdir)/$(DOMAIN).pot; then \ 200 if test -f $(srcdir)/$(DOMAIN).pot; then \
145 sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ 201 sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
@@ -163,12 +219,20 @@ $(srcdir)/$(DOMAIN).pot:
163 219
164# This target rebuilds a PO file if $(DOMAIN).pot has changed. 220# This target rebuilds a PO file if $(DOMAIN).pot has changed.
165# 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.
166$(POFILES): $(srcdir)/$(DOMAIN).pot 222$(POFILES): $(POFILESDEPS)
167 @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ 223 @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
168 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; \
169 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ 226 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
170 echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ 227 echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
171 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 }; \
172 else \ 236 else \
173 $(MAKE) $${lang}.po-create; \ 237 $(MAKE) $${lang}.po-create; \
174 fi 238 fi
@@ -191,7 +255,6 @@ install-data: install-data-@USE_NLS@
191 fi 255 fi
192install-data-no: all 256install-data-no: all
193install-data-yes: all 257install-data-yes: all
194 $(mkdir_p) $(DESTDIR)$(datadir)
195 @catalogs='$(CATALOGS)'; \ 258 @catalogs='$(CATALOGS)'; \
196 for cat in $$catalogs; do \ 259 for cat in $$catalogs; do \
197 cat=`basename $$cat`; \ 260 cat=`basename $$cat`; \
@@ -243,7 +306,6 @@ installdirs-data: installdirs-data-@USE_NLS@
243 fi 306 fi
244installdirs-data-no: 307installdirs-data-no:
245installdirs-data-yes: 308installdirs-data-yes:
246 $(mkdir_p) $(DESTDIR)$(datadir)
247 @catalogs='$(CATALOGS)'; \ 309 @catalogs='$(CATALOGS)'; \
248 for cat in $$catalogs; do \ 310 for cat in $$catalogs; do \
249 cat=`basename $$cat`; \ 311 cat=`basename $$cat`; \
@@ -321,7 +383,7 @@ maintainer-clean: distclean
321 383
322distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) 384distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
323dist distdir: 385dist distdir:
324 $(MAKE) update-po 386 test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
325 @$(MAKE) dist2 387 @$(MAKE) dist2
326# 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.
327dist2: stamp-po $(DISTFILES) 389dist2: stamp-po $(DISTFILES)
@@ -369,9 +431,15 @@ update-po: Makefile
369 tmpdir=`pwd`; \ 431 tmpdir=`pwd`; \
370 echo "$$lang:"; \ 432 echo "$$lang:"; \
371 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ 433 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
372 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"; \
373 cd $(srcdir); \ 435 cd $(srcdir); \
374 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 \
375 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 \
376 rm -f $$tmpdir/$$lang.new.po; \ 444 rm -f $$tmpdir/$$lang.new.po; \
377 else \ 445 else \
@@ -392,9 +460,13 @@ $(DUMMYPOFILES):
392update-gmo: Makefile $(GMOFILES) 460update-gmo: Makefile $(GMOFILES)
393 @: 461 @:
394 462
463# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
464# because execution permission bits may not work on the current file system.
465# Use @SHELL@, which is the shell determined by autoconf for the use by its
466# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
395Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ 467Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
396 cd $(top_builddir) \ 468 cd $(top_builddir) \
397 && $(SHELL) ./config.status $(subdir)/$@.in po-directories 469 && @SHELL@ ./config.status $(subdir)/$@.in po-directories
398 470
399force: 471force:
400 472
diff --git a/po/Makevars.template b/po/Makevars.template
index 32692ab4b..0648ec759 100644
--- a/po/Makevars.template
+++ b/po/Makevars.template
@@ -20,6 +20,13 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
20# their copyright. 20# their copyright.
21COPYRIGHT_HOLDER = Free Software Foundation, Inc. 21COPYRIGHT_HOLDER = Free Software Foundation, Inc.
22 22
23# This tells whether or not to prepend "GNU " prefix to the package
24# name that gets inserted into the header of the $(DOMAIN).pot file.
25# Possible values are "yes", "no", or empty. If it is empty, try to
26# detect it automatically by scanning the files in $(top_srcdir) for
27# "GNU packagename" string.
28PACKAGE_GNU =
29
23# This is the email address or URL to which the translators shall report 30# This is the email address or URL to which the translators shall report
24# bugs in the untranslated strings: 31# bugs in the untranslated strings:
25# - Strings which are not entire sentences, see the maintainer guidelines 32# - Strings which are not entire sentences, see the maintainer guidelines
@@ -39,3 +46,33 @@ MSGID_BUGS_ADDRESS =
39# This is the list of locale categories, beyond LC_MESSAGES, for which the 46# This is the list of locale categories, beyond LC_MESSAGES, for which the
40# message catalogs shall be used. It is usually empty. 47# message catalogs shall be used. It is usually empty.
41EXTRA_LOCALE_CATEGORIES = 48EXTRA_LOCALE_CATEGORIES =
49
50# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
51# context. Possible values are "yes" and "no". Set this to yes if the
52# package uses functions taking also a message context, like pgettext(), or
53# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
54USE_MSGCTXT = no
55
56# These options get passed to msgmerge.
57# Useful options are in particular:
58# --previous to keep previous msgids of translated messages,
59# --quiet to reduce the verbosity.
60MSGMERGE_OPTIONS =
61
62# These options get passed to msginit.
63# If you want to disable line wrapping when writing PO files, add
64# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
65# MSGINIT_OPTIONS.
66MSGINIT_OPTIONS =
67
68# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
69# has changed. Possible values are "yes" and "no". Set this to no if
70# the POT file is checked in the repository and the version control
71# program ignores timestamps.
72PO_DEPENDS_ON_POT = yes
73
74# This tells whether or not to forcibly update $(DOMAIN).pot and
75# regenerate PO files on "make dist". Possible values are "yes" and
76# "no". Set this to no if the POT file and PO files are maintained
77# externally.
78DIST_DEPENDS_ON_UPDATE_PO = yes
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a36c57f33..b350ea996 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -98,6 +98,11 @@ src/dht/gnunet-service-dht_hello.c
98src/dht/gnunet-service-dht_neighbours.c 98src/dht/gnunet-service-dht_neighbours.c
99src/dht/gnunet-service-dht_nse.c 99src/dht/gnunet-service-dht_nse.c
100src/dht/gnunet-service-dht_routing.c 100src/dht/gnunet-service-dht_routing.c
101src/dht/gnunet-service-wdht.c
102src/dht/gnunet-service-wdht_clients.c
103src/dht/gnunet-service-wdht_datacache.c
104src/dht/gnunet-service-wdht_neighbours.c
105src/dht/gnunet-service-wdht_nse.c
101src/dht/gnunet-service-xdht.c 106src/dht/gnunet-service-xdht.c
102src/dht/gnunet-service-xdht_clients.c 107src/dht/gnunet-service-xdht_clients.c
103src/dht/gnunet-service-xdht_datacache.c 108src/dht/gnunet-service-xdht_datacache.c
diff --git a/po/Rules-quot b/po/Rules-quot
index 9c2a995e3..9dc963076 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-04-26 01:11:10 +0000