aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2007-02-08 20:45:54 +0000
committerChristian Grothoff <christian@grothoff.org>2007-02-08 20:45:54 +0000
commit84ddc15a76bea41cfe2f3aabd01262297d5beca2 (patch)
treeedb9f83227fb1551247edfd9412a2cadbc53e0ed
parentc1e8a74921872524d75543f9863c8a9a9ac30786 (diff)
downloadgnunet-gtk-84ddc15a76bea41cfe2f3aabd01262297d5beca2.tar.gz
gnunet-gtk-84ddc15a76bea41cfe2f3aabd01262297d5beca2.zip
gettext update
Diffstat
-rw-r--r--ABOUT-NLS1454
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac2
-rw-r--r--m4/codeset.m414
-rw-r--r--m4/gettext.m4304
-rw-r--r--m4/glibc21.m414
-rw-r--r--m4/iconv.m48
-rw-r--r--m4/intdiv0.m48
-rw-r--r--m4/intmax.m423
-rw-r--r--m4/inttypes-pri.m422
-rw-r--r--m4/inttypes_h.m424
-rw-r--r--m4/lcmessage.m420
-rw-r--r--m4/lib-ld.m48
-rw-r--r--m4/lib-link.m4131
-rw-r--r--m4/lib-prefix.m452
-rw-r--r--m4/longdouble.m415
-rw-r--r--m4/longlong.m453
-rw-r--r--m4/nls.m432
-rw-r--r--m4/po.m4127
-rw-r--r--m4/printf-posix.m412
-rw-r--r--m4/progtest.m415
-rw-r--r--m4/size_max.m481
-rw-r--r--m4/stdint_h.m424
-rw-r--r--m4/uintmax_t.m422
-rw-r--r--m4/ulonglong.m453
-rw-r--r--m4/wchar_t.m48
-rw-r--r--m4/wint_t.m48
-rw-r--r--m4/xsize.m413
28 files changed, 1519 insertions, 1032 deletions
diff --git a/ABOUT-NLS b/ABOUT-NLS
index 8e161528..ec20977e 100644
--- a/ABOUT-NLS
+++ b/ABOUT-NLS
@@ -1,10 +1,11 @@
1Notes on the Free Translation Project 11 Notes on the Free Translation Project
2************************************* 2***************************************
3 3
4Free software is going international! The Free Translation Project is 4Free software is going international! The Free Translation Project is
5a way to get maintainers of free software, translators, and users all 5a way to get maintainers of free software, translators, and users all
6together, so that will gradually become able to speak many languages. 6together, so that free software will gradually become able to speak many
7A few packages already provide translations for their messages. 7languages. A few packages already provide translations for their
8messages.
8 9
9 If you found this `ABOUT-NLS' file inside a distribution, you may 10 If you found this `ABOUT-NLS' file inside a distribution, you may
10assume that the distributed package does use GNU `gettext' internally, 11assume that the distributed package does use GNU `gettext' internally,
@@ -15,15 +16,15 @@ this package with messages translated.
15 Installers will find here some useful hints. These notes also 16 Installers will find here some useful hints. These notes also
16explain how users should proceed for getting the programs to use the 17explain how users should proceed for getting the programs to use the
17available translations. They tell how people wanting to contribute and 18available translations. They tell how people wanting to contribute and
18work at translations should contact the appropriate team. 19work on translations can contact the appropriate team.
19 20
20 When reporting bugs in the `intl/' directory or bugs which may be 21 When reporting bugs in the `intl/' directory or bugs which may be
21related to internationalization, you should tell about the version of 22related to internationalization, you should tell about the version of
22`gettext' which is used. The information can be found in the 23`gettext' which is used. The information can be found in the
23`intl/VERSION' file, in internationalized packages. 24`intl/VERSION' file, in internationalized packages.
24 25
25Quick configuration advice 261.1 Quick configuration advice
26========================== 27==============================
27 28
28If you want to exploit the full power of internationalization, you 29If you want to exploit the full power of internationalization, you
29should configure it using 30should configure it using
@@ -45,8 +46,8 @@ to change to GNU `gettext' as soon as possible.
45you have installed a recent copy of the GNU gettext package with the 46you have installed a recent copy of the GNU gettext package with the
46included `libintl'. 47included `libintl'.
47 48
48INSTALL Matters 491.2 INSTALL Matters
49=============== 50===================
50 51
51Some packages are "localizable" when properly installed; the programs 52Some packages are "localizable" when properly installed; the programs
52they contain can be made to speak your own native language. Most such 53they contain can be made to speak your own native language. Most such
@@ -55,27 +56,27 @@ internationalization, predating GNU `gettext'.
55 56
56 By default, this package will be installed to allow translation of 57 By default, this package will be installed to allow translation of
57messages. It will automatically detect whether the system already 58messages. It will automatically detect whether the system already
58provides the GNU `gettext' functions. If not, the GNU `gettext' own 59provides the GNU `gettext' functions. If not, the included GNU
59library will be used. This library is wholly contained within this 60`gettext' library will be used. This library is wholly contained
60package, usually in the `intl/' subdirectory, so prior installation of 61within this package, usually in the `intl/' subdirectory, so prior
61the GNU `gettext' package is _not_ required. Installers may use 62installation of the GNU `gettext' package is _not_ required.
62special options at configuration time for changing the default 63Installers may use special options at configuration time for changing
63behaviour. The commands: 64the default behaviour. The commands:
64 65
65 ./configure --with-included-gettext 66 ./configure --with-included-gettext
66 ./configure --disable-nls 67 ./configure --disable-nls
67 68
68will respectively bypass any pre-existing `gettext' to use the 69will, respectively, bypass any pre-existing `gettext' to use the
69internationalizing routines provided within this package, or else, 70internationalizing routines provided within this package, or else,
70_totally_ disable translation of messages. 71_totally_ disable translation of messages.
71 72
72 When you already have GNU `gettext' installed on your system and run 73 When you already have GNU `gettext' installed on your system and run
73configure without an option for your new package, `configure' will 74configure without an option for your new package, `configure' will
74probably detect the previously built and installed `libintl.a' file and 75probably detect the previously built and installed `libintl.a' file and
75will decide to use this. This might be not what is desirable. You 76will decide to use this. This might not be desirable. You should use
76should use the more recent version of the GNU `gettext' library. I.e. 77the more recent version of the GNU `gettext' library. I.e. if the file
77if the file `intl/VERSION' shows that the library which comes with this 78`intl/VERSION' shows that the library which comes with this package is
78package is more recent, you should use 79more recent, you should use
79 80
80 ./configure --with-included-gettext 81 ./configure --with-included-gettext
81 82
@@ -86,7 +87,7 @@ and therefore it will not be used. The reason is that even an
86emulation of `gettext' on top of `catgets' could not provide all the 87emulation of `gettext' on top of `catgets' could not provide all the
87extensions of the GNU `gettext' library. 88extensions of the GNU `gettext' library.
88 89
89 Internationalized packages have usually many `po/LL.po' files, where 90 Internationalized packages usually have many `po/LL.po' files, where
90LL gives an ISO 639 two-letter code identifying the language. Unless 91LL gives an ISO 639 two-letter code identifying the language. Unless
91translations have been forbidden at `configure' time by using the 92translations have been forbidden at `configure' time by using the
92`--disable-nls' switch, all available translations are installed 93`--disable-nls' switch, all available translations are installed
@@ -95,8 +96,8 @@ may be set, prior to configuration, to limit the installed set.
95`LINGUAS' should then contain a space separated list of two-letter 96`LINGUAS' should then contain a space separated list of two-letter
96codes, stating which languages are allowed. 97codes, stating which languages are allowed.
97 98
98Using This Package 991.3 Using This Package
99================== 100======================
100 101
101As a user, if your language has been installed for this package, you 102As a user, if your language has been installed for this package, you
102only have to set the `LANG' environment variable to the appropriate 103only have to set the `LANG' environment variable to the appropriate
@@ -117,8 +118,8 @@ country code serves to distinguish the dialects.
117language and `CC' denoting the country, is the one use on systems based 118language and `CC' denoting the country, is the one use on systems based
118on GNU libc. On other systems, some variations of this scheme are 119on GNU libc. On other systems, some variations of this scheme are
119used, such as `LL' or `LL_CC.ENCODING'. You can get the list of 120used, such as `LL' or `LL_CC.ENCODING'. You can get the list of
120locales supported by your system for your country by running the command 121locales supported by your system for your language by running the
121`locale -a | grep '^LL''. 122command `locale -a | grep '^LL''.
122 123
123 Not all programs have translations for all languages. By default, an 124 Not all programs have translations for all languages. By default, an
124English message is shown in place of a nonexistent translation. If you 125English message is shown in place of a nonexistent translation. If you
@@ -131,14 +132,21 @@ system libraries. For example, some Swedish users who would rather
131read translations in German than English for when Swedish is not 132read translations in German than English for when Swedish is not
132available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. 133available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
133 134
135 Special advice for Norwegian users: The language code for Norwegian
136bokma*l changed from `no' to `nb' recently (in 2003). During the
137transition period, while some message catalogs for this language are
138installed under `nb' and some older ones under `no', it's recommended
139for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
140older translations are used.
141
134 In the `LANGUAGE' environment variable, but not in the `LANG' 142 In the `LANGUAGE' environment variable, but not in the `LANG'
135environment variable, `LL_CC' combinations can be abbreviated as `LL' 143environment variable, `LL_CC' combinations can be abbreviated as `LL'
136to denote the language's main dialect. For example, `de' is equivalent 144to denote the language's main dialect. For example, `de' is equivalent
137to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' 145to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
138(Portuguese as spoken in Portugal) in this context. 146(Portuguese as spoken in Portugal) in this context.
139 147
140Translating Teams 1481.4 Translating Teams
141================= 149=====================
142 150
143For the Free Translation Project to be a success, we need interested 151For the Free Translation Project to be a success, we need interested
144people who like their own language and write it well, and who are also 152people who like their own language and write it well, and who are also
@@ -164,509 +172,897 @@ get started, please write to `translation@iro.umontreal.ca' to reach the
164coordinator for all translator teams. 172coordinator for all translator teams.
165 173
166 The English team is special. It works at improving and uniformizing 174 The English team is special. It works at improving and uniformizing
167the terminology in use. Proven linguistic skill are praised more than 175the terminology in use. Proven linguistic skills are praised more than
168programming skill, here. 176programming skills, here.
169 177
170Available Packages 1781.5 Available Packages
171================== 179======================
172 180
173Languages are not equally supported in all packages. The following 181Languages are not equally supported in all packages. The following
174matrix shows the current state of internationalization, as of November 182matrix shows the current state of internationalization, as of October
1752003. The matrix shows, in regard of each package, for which languages 1832006. The matrix shows, in regard of each package, for which languages
176PO files have been submitted to translation coordination, with a 184PO files have been submitted to translation coordination, with a
177translation percentage of at least 50%. 185translation percentage of at least 50%.
178 186
179 Ready PO files am az be bg ca cs da de el en en_GB eo es 187 Ready PO files af am ar az be bg bs ca cs cy da de el en en_GB eo
180 +-------------------------------------------+ 188 +----------------------------------------------------+
181 a2ps | [] [] [] [] | 189 GNUnet | [] |
182 aegis | () | 190 a2ps | [] [] [] [] [] |
183 ant-phone | () | 191 aegis | () |
184 anubis | | 192 ant-phone | () |
185 ap-utils | | 193 anubis | [] |
186 bash | [] [] [] [] | 194 ap-utils | |
187 batchelor | | 195 aspell | [] [] [] [] [] |
188 bfd | [] [] | 196 bash | [] [] [] |
189 binutils | [] [] | 197 batchelor | [] |
190 bison | [] [] [] | 198 bfd | |
191 bluez-pin | [] [] | 199 bibshelf | [] |
192 clisp | [] [] [] | 200 binutils | [] |
193 clisp | | 201 bison | [] [] |
194 coreutils | [] [] [] [] | 202 bison-runtime | |
195 cpio | [] [] [] | 203 bluez-pin | [] [] [] [] [] |
196 darkstat | [] () [] | 204 cflow | [] |
197 diffutils | [] [] [] [] [] [] [] | 205 clisp | [] [] |
198 e2fsprogs | [] [] | 206 console-tools | [] [] |
199 enscript | [] [] [] [] | 207 coreutils | [] [] [] |
200 error | [] [] [] [] [] | 208 cpio | |
201 fetchmail | [] () [] [] [] [] | 209 cpplib | [] [] [] |
202 fileutils | [] [] [] | 210 cryptonit | [] |
203 findutils | [] [] [] [] [] [] [] | 211 darkstat | [] () [] |
204 flex | [] [] [] [] | 212 dialog | [] [] [] [] [] [] |
205 fslint | | 213 diffutils | [] [] [] [] [] [] |
206 gas | [] | 214 doodle | [] |
207 gawk | [] [] [] [] | 215 e2fsprogs | [] [] |
208 gbiff | [] | 216 enscript | [] [] [] [] |
209 gcal | [] | 217 error | [] [] [] [] |
210 gcc | [] [] | 218 fetchmail | [] [] () [] |
211 gettext | [] [] [] [] [] | 219 fileutils | [] [] |
212 gettext-examples | [] [] [] | 220 findutils | [] [] [] |
213 gettext-runtime | [] [] [] [] [] | 221 flex | [] [] [] |
214 gettext-tools | [] [] [] | 222 fslint | [] |
215 gimp-print | [] [] [] [] [] | 223 gas | |
216 gliv | | 224 gawk | [] [] [] |
217 glunarclock | [] [] [] | 225 gbiff | [] |
218 gnubiff | [] | 226 gcal | [] |
219 gnucash | [] () [] [] | 227 gcc | [] |
220 gnucash-glossary | [] () [] | 228 gettext-examples | [] [] [] [] [] |
221 gnupg | [] () [] [] [] [] | 229 gettext-runtime | [] [] [] [] [] |
222 gpe-aerial | [] | 230 gettext-tools | [] [] |
223 gpe-beam | [] [] | 231 gimp-print | [] [] [] [] |
224 gpe-calendar | [] [] | 232 gip | [] |
225 gpe-clock | [] [] | 233 gliv | [] |
226 gpe-conf | [] [] | 234 glunarclock | [] |
227 gpe-contacts | [] [] | 235 gmult | [] [] |
228 gpe-edit | [] | 236 gnubiff | () |
229 gpe-go | [] | 237 gnucash | () () [] |
230 gpe-login | [] [] | 238 gnucash-glossary | [] () |
231 gpe-ownerinfo | [] [] | 239 gnuedu | |
232 gpe-sketchbook | [] [] | 240 gnulib | [] [] [] [] [] [] |
233 gpe-su | [] [] | 241 gnunet-gtk | |
234 gpe-taskmanager | [] [] | 242 gnutls | |
235 gpe-timesheet | [] | 243 gpe-aerial | [] [] |
236 gpe-today | [] [] | 244 gpe-beam | [] [] |
237 gpe-todo | [] [] | 245 gpe-calendar | |
238 gphoto2 | [] [] [] [] | 246 gpe-clock | [] [] |
239 gprof | [] [] [] | 247 gpe-conf | [] [] |
240 gpsdrive | () () () | 248 gpe-contacts | |
241 gramadoir | [] | 249 gpe-edit | [] |
242 grep | [] [] [] [] [] [] | 250 gpe-filemanager | |
243 gretl | [] | 251 gpe-go | [] |
244 gtick | () | 252 gpe-login | [] [] |
245 hello | [] [] [] [] [] [] | 253 gpe-ownerinfo | [] [] |
246 id-utils | [] [] | 254 gpe-package | |
247 indent | [] [] [] [] | 255 gpe-sketchbook | [] [] |
248 jpilot | [] [] [] | 256 gpe-su | [] [] |
249 jtag | | 257 gpe-taskmanager | [] [] |
250 jwhois | [] | 258 gpe-timesheet | [] |
251 kbd | [] [] [] [] [] | 259 gpe-today | [] [] |
252 latrine | () | 260 gpe-todo | |
253 ld | [] [] | 261 gphoto2 | [] [] [] [] |
254 libc | [] [] [] [] [] [] | 262 gprof | [] [] |
255 libgpewidget | [] [] | 263 gpsdrive | () () |
256 libiconv | [] [] [] [] [] | 264 gramadoir | [] [] |
257 lifelines | [] () | 265 grep | [] [] [] [] [] [] |
258 lilypond | [] | 266 gretl | |
259 lingoteach | | 267 gsasl | |
260 lingoteach_lessons | () () | 268 gss | |
261 lynx | [] [] [] [] | 269 gst-plugins | [] [] [] [] |
262 m4 | [] [] [] [] | 270 gst-plugins-base | [] [] [] |
263 mailutils | [] [] | 271 gst-plugins-good | [] [] [] [] [] [] [] |
264 make | [] [] [] | 272 gstreamer | [] [] [] [] [] [] [] |
265 man-db | [] () [] [] () | 273 gtick | () |
266 minicom | [] [] [] | 274 gtkam | [] [] [] |
267 mysecretdiary | [] [] [] | 275 gtkorphan | [] [] |
268 nano | [] () [] [] [] | 276 gtkspell | [] [] [] [] |
269 nano_1_0 | [] () [] [] [] | 277 gutenprint | [] |
270 opcodes | [] | 278 hello | [] [] [] [] [] |
271 parted | [] [] [] [] [] | 279 id-utils | [] [] |
272 ptx | [] [] [] [] [] | 280 impost | |
273 python | | 281 indent | [] [] [] |
274 radius | | 282 iso_3166 | [] [] |
275 recode | [] [] [] [] [] [] [] | 283 iso_3166_2 | |
276 screem | | 284 iso_4217 | [] |
277 scrollkeeper | [] [] [] [] [] [] | 285 iso_639 | [] [] |
278 sed | [] [] [] [] [] | 286 jpilot | [] |
279 sh-utils | [] [] [] | 287 jtag | |
280 shared-mime-info | | 288 jwhois | |
281 sharutils | [] [] [] [] [] [] | 289 kbd | [] [] [] [] |
282 sketch | [] () [] | 290 keytouch | |
283 soundtracker | [] [] [] | 291 keytouch-editor | |
284 sp | [] | 292 keytouch-keyboa... | |
285 tar | [] [] [] [] | 293 latrine | () |
286 texinfo | [] [] [] | 294 ld | [] |
287 textutils | [] [] [] [] | 295 leafpad | [] [] [] [] [] |
288 tin | () () | 296 libc | [] [] [] [] [] |
289 tuxpaint | [] [] [] [] [] [] [] | 297 libexif | [] |
290 util-linux | [] [] [] [] [] | 298 libextractor | [] |
291 vorbis-tools | [] [] [] [] | 299 libgpewidget | [] [] [] |
292 wastesedge | () | 300 libgpg-error | [] |
293 wdiff | [] [] [] [] | 301 libgphoto2 | [] [] |
294 wget | [] [] [] [] [] [] | 302 libgphoto2_port | [] [] |
295 xchat | [] [] [] [] | 303 libgsasl | |
296 xfree86_xkb_xml | [] | 304 libiconv | [] [] |
297 xpad | [] | 305 libidn | [] [] |
298 +-------------------------------------------+ 306 lifelines | [] () |
299 am az be bg ca cs da de el en en_GB eo es 307 lilypond | [] |
300 0 1 8 3 37 37 54 73 15 1 5 12 62 308 lingoteach | |
301 309 lynx | [] [] [] [] |
302 et fa fi fr ga gl he hr hu id is it ja 310 m4 | [] [] [] [] |
303 +----------------------------------------+ 311 mailutils | [] |
304 a2ps | [] [] [] () | 312 make | [] [] |
305 aegis | | 313 man-db | [] () [] [] |
306 ant-phone | | 314 minicom | [] [] [] |
307 anubis | [] | 315 mysecretdiary | [] [] |
308 ap-utils | [] | 316 nano | [] [] [] |
309 bash | [] [] | 317 nano_1_0 | [] () [] [] |
310 batchelor | [] | 318 opcodes | [] |
311 bfd | [] | 319 parted | |
312 binutils | [] [] | 320 pilot-qof | [] |
313 bison | [] [] [] [] | 321 psmisc | [] |
314 bluez-pin | [] [] [] [] [] | 322 pwdutils | |
315 clisp | [] | 323 python | |
316 clisp | | 324 qof | |
317 coreutils | [] [] [] [] [] [] | 325 radius | [] |
318 cpio | [] [] [] | 326 recode | [] [] [] [] [] [] |
319 darkstat | () [] [] [] | 327 rpm | [] [] |
320 diffutils | [] [] [] [] [] [] [] | 328 screem | |
321 e2fsprogs | | 329 scrollkeeper | [] [] [] [] [] [] [] [] |
322 enscript | [] [] | 330 sed | [] [] [] |
323 error | [] [] [] [] | 331 sh-utils | [] [] |
324 fetchmail | [] | 332 shared-mime-info | [] [] [] [] |
325 fileutils | [] [] [] [] [] [] | 333 sharutils | [] [] [] [] [] [] |
326 findutils | [] [] [] [] [] [] [] [] [] [] | 334 shishi | |
327 flex | [] [] | 335 silky | |
328 fslint | | 336 skencil | [] () |
329 gas | [] | 337 sketch | [] () |
330 gawk | [] [] [] | 338 solfege | |
331 gbiff | | 339 soundtracker | [] [] |
332 gcal | [] | 340 sp | [] |
333 gcc | [] | 341 stardict | [] |
334 gettext | [] [] | 342 system-tools-ba... | [] [] [] [] [] [] [] [] [] |
335 gettext-examples | [] [] | 343 tar | [] |
336 gettext-runtime | [] [] [] [] | 344 texinfo | [] [] [] |
337 gettext-tools | [] [] | 345 textutils | [] [] [] |
338 gimp-print | [] [] | 346 tin | () () |
339 gliv | () | 347 tp-robot | [] |
340 glunarclock | [] [] [] [] [] | 348 tuxpaint | [] [] [] [] [] |
341 gnubiff | | 349 unicode-han-tra... | |
342 gnucash | () [] | 350 unicode-transla... | |
343 gnucash-glossary | [] | 351 util-linux | [] [] [] [] |
344 gnupg | [] [] [] [] [] [] [] | 352 vorbis-tools | [] [] [] [] |
345 gpe-aerial | [] | 353 wastesedge | () |
346 gpe-beam | [] | 354 wdiff | [] [] [] [] |
347 gpe-calendar | [] [] [] | 355 wget | [] [] |
348 gpe-clock | [] | 356 xchat | [] [] [] [] [] [] |
349 gpe-conf | [] | 357 xkeyboard-config | |
350 gpe-contacts | [] [] | 358 xpad | [] [] |
351 gpe-edit | [] [] | 359 +----------------------------------------------------+
352 gpe-go | [] | 360 af am ar az be bg bs ca cs cy da de el en en_GB eo
353 gpe-login | [] [] | 361 10 0 1 2 9 22 1 42 41 2 60 95 16 1 17 16
354 gpe-ownerinfo | [] [] [] | 362
355 gpe-sketchbook | [] | 363 es et eu fa fi fr ga gl gu he hi hr hu id is it
356 gpe-su | [] | 364 +--------------------------------------------------+
357 gpe-taskmanager | [] | 365 GNUnet | |
358 gpe-timesheet | [] [] [] | 366 a2ps | [] [] [] () |
359 gpe-today | [] [] | 367 aegis | |
360 gpe-todo | [] [] | 368 ant-phone | [] |
361 gphoto2 | [] [] [] | 369 anubis | [] |
362 gprof | [] [] | 370 ap-utils | [] [] |
363 gpsdrive | () [] () () | 371 aspell | [] [] [] |
364 gramadoir | [] | 372 bash | [] [] [] |
365 grep | [] [] [] [] [] [] [] [] [] [] [] | 373 batchelor | [] [] |
366 gretl | [] | 374 bfd | [] |
367 gtick | [] [] | 375 bibshelf | [] [] [] |
368 hello | [] [] [] [] [] [] [] [] [] [] [] [] | 376 binutils | [] [] [] |
369 id-utils | [] [] [] [] | 377 bison | [] [] [] [] [] [] |
370 indent | [] [] [] [] [] [] [] [] [] | 378 bison-runtime | [] [] [] [] [] |
371 jpilot | [] () | 379 bluez-pin | [] [] [] [] [] |
372 jtag | | 380 cflow | [] |
373 jwhois | [] [] [] [] | 381 clisp | [] [] |
374 kbd | [] | 382 console-tools | |
375 latrine | | 383 coreutils | [] [] [] [] [] [] |
376 ld | [] | 384 cpio | [] [] [] |
377 libc | [] [] [] [] [] | 385 cpplib | [] [] |
378 libgpewidget | [] [] [] [] | 386 cryptonit | [] |
379 libiconv | [] [] [] [] [] [] [] [] [] | 387 darkstat | [] () [] [] [] |
380 lifelines | () | 388 dialog | [] [] [] [] [] [] [] [] |
381 lilypond | [] | 389 diffutils | [] [] [] [] [] [] [] [] [] |
382 lingoteach | [] [] | 390 doodle | [] [] |
383 lingoteach_lessons | | 391 e2fsprogs | [] [] [] |
384 lynx | [] [] [] [] | 392 enscript | [] [] [] |
385 m4 | [] [] [] [] | 393 error | [] [] [] [] [] |
386 mailutils | | 394 fetchmail | [] |
387 make | [] [] [] [] [] | 395 fileutils | [] [] [] [] [] [] |
388 man-db | () () | 396 findutils | [] [] [] [] |
389 minicom | [] [] [] [] | 397 flex | [] [] [] |
390 mysecretdiary | [] [] | 398 fslint | [] |
391 nano | [] [] [] [] | 399 gas | [] [] |
392 nano_1_0 | [] [] [] [] | 400 gawk | [] [] [] [] |
393 opcodes | [] | 401 gbiff | [] |
394 parted | [] [] [] | 402 gcal | [] [] |
395 ptx | [] [] [] [] [] [] [] | 403 gcc | [] |
396 python | | 404 gettext-examples | [] [] [] [] [] [] |
397 radius | | 405 gettext-runtime | [] [] [] [] [] [] |
398 recode | [] [] [] [] [] [] | 406 gettext-tools | [] [] [] |
399 screem | | 407 gimp-print | [] [] |
400 scrollkeeper | [] | 408 gip | [] [] [] |
401 sed | [] [] [] [] [] [] [] [] [] | 409 gliv | () |
402 sh-utils | [] [] [] [] [] [] [] | 410 glunarclock | [] [] [] |
403 shared-mime-info | [] | 411 gmult | [] [] [] |
404 sharutils | [] [] [] [] [] | 412 gnubiff | () () |
405 sketch | [] | 413 gnucash | () () () |
406 soundtracker | [] [] [] [] | 414 gnucash-glossary | [] [] |
407 sp | [] () | 415 gnuedu | [] |
408 tar | [] [] [] [] [] [] [] [] [] | 416 gnulib | [] [] [] [] [] [] [] [] |
409 texinfo | [] [] [] [] | 417 gnunet-gtk | |
410 textutils | [] [] [] [] [] | 418 gnutls | |
411 tin | [] () | 419 gpe-aerial | [] [] |
412 tuxpaint | [] [] [] [] [] [] [] [] | 420 gpe-beam | [] [] |
413 util-linux | [] [] [] [] () [] | 421 gpe-calendar | |
414 vorbis-tools | [] | 422 gpe-clock | [] [] [] [] |
415 wastesedge | () | 423 gpe-conf | [] |
416 wdiff | [] [] [] [] [] [] | 424 gpe-contacts | [] [] |
417 wget | [] [] [] [] [] [] [] | 425 gpe-edit | [] [] [] [] |
418 xchat | [] [] [] | 426 gpe-filemanager | [] |
419 xfree86_xkb_xml | | 427 gpe-go | [] [] [] |
420 xpad | [] | 428 gpe-login | [] [] [] |
421 +----------------------------------------+ 429 gpe-ownerinfo | [] [] [] [] [] |
422 et fa fi fr ga gl he hr hu id is it ja 430 gpe-package | [] |
423 21 1 24 84 24 24 8 10 38 31 1 22 33 431 gpe-sketchbook | [] [] |
424 432 gpe-su | [] [] [] [] |
425 ko lg lt lv ms nb nl nn no pl pt pt_BR ro 433 gpe-taskmanager | [] [] [] |
426 +-------------------------------------------+ 434 gpe-timesheet | [] [] [] [] |
427 a2ps | () [] [] () () [] [] | 435 gpe-today | [] [] [] [] |
428 aegis | () () | 436 gpe-todo | [] |
429 ant-phone | [] [] | 437 gphoto2 | [] [] [] [] [] |
430 anubis | [] [] [] [] [] | 438 gprof | [] [] [] [] |
431 ap-utils | [] () [] | 439 gpsdrive | () () [] () |
432 bash | [] [] | 440 gramadoir | [] [] |
433 batchelor | [] | 441 grep | [] [] [] [] [] [] [] [] [] [] [] [] |
434 bfd | [] | 442 gretl | [] [] [] |
435 binutils | | 443 gsasl | [] [] |
436 bison | [] [] [] [] | 444 gss | [] |
437 bluez-pin | [] [] [] | 445 gst-plugins | [] [] [] |
438 clisp | [] | 446 gst-plugins-base | [] [] |
439 clisp | | 447 gst-plugins-good | [] [] [] |
440 coreutils | [] | 448 gstreamer | [] [] [] |
441 cpio | [] [] [] [] [] | 449 gtick | [] |
442 darkstat | [] [] [] [] | 450 gtkam | [] [] [] [] |
443 diffutils | [] [] [] [] | 451 gtkorphan | [] [] |
444 e2fsprogs | [] | 452 gtkspell | [] [] [] [] [] [] |
445 enscript | [] [] [] | 453 gutenprint | [] |
446 error | [] [] [] | 454 hello | [] [] [] [] [] [] [] [] [] [] [] [] [] |
447 fetchmail | [] [] () | 455 id-utils | [] [] [] [] [] |
448 fileutils | [] | 456 impost | [] [] |
449 findutils | [] [] [] [] [] | 457 indent | [] [] [] [] [] [] [] [] [] [] |
450 flex | [] [] [] [] | 458 iso_3166 | [] [] [] |
451 fslint | [] [] | 459 iso_3166_2 | [] |
452 gas | | 460 iso_4217 | [] [] [] [] |
453 gawk | [] [] [] | 461 iso_639 | [] [] [] [] [] |
454 gbiff | [] [] | 462 jpilot | [] [] |
455 gcal | | 463 jtag | [] |
456 gcc | | 464 jwhois | [] [] [] [] [] |
457 gettext | [] [] [] | 465 kbd | [] [] |
458 gettext-examples | [] [] | 466 keytouch | [] |
459 gettext-runtime | [] [] [] | 467 keytouch-editor | [] |
460 gettext-tools | [] [] [] | 468 keytouch-keyboa... | [] |
461 gimp-print | [] | 469 latrine | [] [] [] |
462 gliv | [] [] [] | 470 ld | [] [] |
463 glunarclock | [] [] [] | 471 leafpad | [] [] [] [] [] [] |
464 gnubiff | | 472 libc | [] [] [] [] [] |
465 gnucash | [] [] () | 473 libexif | [] |
466 gnucash-glossary | [] [] | 474 libextractor | [] |
467 gnupg | [] | 475 libgpewidget | [] [] [] [] [] |
468 gpe-aerial | [] [] [] | 476 libgpg-error | |
469 gpe-beam | [] [] [] | 477 libgphoto2 | [] [] [] |
470 gpe-calendar | [] [] [] | 478 libgphoto2_port | [] [] |
471 gpe-clock | [] [] [] | 479 libgsasl | [] [] |
472 gpe-conf | [] [] [] | 480 libiconv | [] [] |
473 gpe-contacts | [] [] [] | 481 libidn | [] [] |
474 gpe-edit | [] [] [] | 482 lifelines | () |
475 gpe-go | [] [] | 483 lilypond | [] |
476 gpe-login | [] [] [] | 484 lingoteach | [] [] [] |
477 gpe-ownerinfo | [] [] [] | 485 lynx | [] [] [] |
478 gpe-sketchbook | [] [] [] | 486 m4 | [] [] [] [] |
479 gpe-su | [] [] [] | 487 mailutils | [] [] |
480 gpe-taskmanager | [] [] [] | 488 make | [] [] [] [] [] [] [] [] |
481 gpe-timesheet | [] [] [] | 489 man-db | () |
482 gpe-today | [] [] [] | 490 minicom | [] [] [] [] |
483 gpe-todo | [] [] [] | 491 mysecretdiary | [] [] [] |
484 gphoto2 | [] | 492 nano | [] [] [] [] [] [] |
485 gprof | [] [] | 493 nano_1_0 | [] [] [] [] [] |
486 gpsdrive | () () () [] | 494 opcodes | [] [] [] [] |
487 gramadoir | [] | 495 parted | [] [] [] [] |
488 grep | [] [] [] [] | 496 pilot-qof | |
489 gretl | | 497 psmisc | [] [] [] |
490 gtick | [] [] | 498 pwdutils | |
491 hello | [] [] [] [] [] [] [] [] [] [] | 499 python | |
492 id-utils | [] [] [] | 500 qof | [] |
493 indent | [] [] [] | 501 radius | [] [] |
494 jpilot | () () | 502 recode | [] [] [] [] [] [] [] [] |
495 jtag | | 503 rpm | [] [] |
496 jwhois | [] [] [] [] | 504 screem | |
497 kbd | [] [] [] | 505 scrollkeeper | [] [] [] |
498 latrine | [] | 506 sed | [] [] [] [] [] |
499 ld | | 507 sh-utils | [] [] [] [] [] [] [] |
500 libc | [] [] [] [] [] | 508 shared-mime-info | [] [] [] [] [] [] |
501 libgpewidget | [] [] [] | 509 sharutils | [] [] [] [] [] [] [] [] |
502 libiconv | [] [] [] [] | 510 shishi | |
503 lifelines | | 511 silky | [] |
504 lilypond | | 512 skencil | [] [] |
505 lingoteach | | 513 sketch | [] [] |
506 lingoteach_lessons | | 514 solfege | [] |
507 lynx | [] [] | 515 soundtracker | [] [] [] |
508 m4 | [] [] [] [] | 516 sp | [] |
509 mailutils | [] | 517 stardict | [] |
510 make | [] [] [] [] | 518 system-tools-ba... | [] [] [] [] [] [] [] [] |
511 man-db | [] | 519 tar | [] [] [] [] [] [] [] |
512 minicom | [] [] [] | 520 texinfo | [] [] |
513 mysecretdiary | [] [] [] | 521 textutils | [] [] [] [] [] |
514 nano | [] [] [] [] | 522 tin | [] () |
515 nano_1_0 | [] [] [] [] [] | 523 tp-robot | [] [] [] [] |
516 opcodes | [] [] | 524 tuxpaint | [] [] |
517 parted | [] [] [] [] | 525 unicode-han-tra... | |
518 ptx | [] [] [] [] [] [] [] | 526 unicode-transla... | [] [] |
519 python | | 527 util-linux | [] [] [] [] [] [] [] |
520 radius | [] | 528 vorbis-tools | [] [] |
521 recode | [] [] [] | 529 wastesedge | () |
522 screem | | 530 wdiff | [] [] [] [] [] [] [] [] |
523 scrollkeeper | [] [] [] [] | 531 wget | [] [] [] [] [] [] [] [] |
524 sed | [] [] [] | 532 xchat | [] [] [] [] [] [] [] [] |
525 sh-utils | [] | 533 xkeyboard-config | [] [] [] [] |
526 shared-mime-info | [] | 534 xpad | [] [] [] |
527 sharutils | [] | 535 +--------------------------------------------------+
528 sketch | [] [] | 536 es et eu fa fi fr ga gl gu he hi hr hu id is it
529 soundtracker | | 537 88 22 14 2 40 115 61 14 1 8 1 6 59 31 0 52
530 sp | | 538
531 tar | [] [] [] [] [] [] | 539 ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no
532 texinfo | [] [] [] | 540 +-------------------------------------------------+
533 textutils | [] [] | 541 GNUnet | |
534 tin | | 542 a2ps | () [] [] () |
535 tuxpaint | [] [] [] [] [] [] [] [] [] | 543 aegis | () |
536 util-linux | [] [] | 544 ant-phone | [] |
537 vorbis-tools | [] [] | 545 anubis | [] [] [] |
538 wastesedge | | 546 ap-utils | [] |
539 wdiff | [] [] [] [] | 547 aspell | [] [] |
540 wget | [] [] | 548 bash | [] |
541 xchat | [] [] | 549 batchelor | [] [] |
542 xfree86_xkb_xml | [] | 550 bfd | |
543 xpad | [] [] | 551 bibshelf | [] |
544 +-------------------------------------------+ 552 binutils | |
545 ko lg lt lv ms nb nl nn no pl pt pt_BR ro 553 bison | [] [] [] |
546 11 0 1 2 12 10 60 4 4 38 23 34 74 554 bison-runtime | [] [] [] |
547 555 bluez-pin | [] [] [] |
548 ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW 556 cflow | |
549 +-------------------------------------------+ 557 clisp | [] |
550 a2ps | [] [] [] [] [] | 16 558 console-tools | |
551 aegis | () | 0 559 coreutils | [] |
552 ant-phone | | 2 560 cpio | |
553 anubis | [] [] [] | 9 561 cpplib | [] |
554 ap-utils | () | 3 562 cryptonit | [] |
555 bash | [] | 9 563 darkstat | [] [] |
556 batchelor | | 2 564 dialog | [] [] |
557 bfd | [] [] | 6 565 diffutils | [] [] [] |
558 binutils | [] [] [] | 7 566 doodle | |
559 bison | [] [] [] | 14 567 e2fsprogs | [] |
560 bluez-pin | [] [] [] | 13 568 enscript | [] |
561 clisp | | 5 569 error | [] |
562 clisp | | 0 570 fetchmail | [] [] |
563 coreutils | [] [] [] [] [] | 16 571 fileutils | [] [] |
564 cpio | [] [] [] | 14 572 findutils | [] |
565 darkstat | [] [] [] () () | 12 573 flex | [] [] |
566 diffutils | [] [] [] [] | 22 574 fslint | [] [] |
567 e2fsprogs | [] [] | 5 575 gas | |
568 enscript | [] [] [] | 12 576 gawk | [] [] |
569 error | [] [] [] | 15 577 gbiff | [] |
570 fetchmail | [] [] [] | 11 578 gcal | |
571 fileutils | [] [] [] [] [] [] | 16 579 gcc | |
572 findutils | [] [] [] [] [] [] [] | 29 580 gettext-examples | [] [] |
573 flex | [] [] [] | 13 581 gettext-runtime | [] [] [] |
574 fslint | | 2 582 gettext-tools | [] [] |
575 gas | [] | 3 583 gimp-print | [] [] |
576 gawk | [] [] | 12 584 gip | [] [] |
577 gbiff | | 3 585 gliv | [] |
578 gcal | [] [] | 4 586 glunarclock | [] [] |
579 gcc | [] | 4 587 gmult | [] [] |
580 gettext | [] [] [] [] [] [] | 16 588 gnubiff | |
581 gettext-examples | [] [] | 9 589 gnucash | () () |
582 gettext-runtime | [] [] [] [] [] [] [] [] [] | 21 590 gnucash-glossary | [] |
583 gettext-tools | [] [] [] [] [] [] | 14 591 gnuedu | |
584 gimp-print | [] [] | 10 592 gnulib | [] [] [] [] |
585 gliv | | 3 593 gnunet-gtk | |
586 glunarclock | [] [] [] [] | 15 594 gnutls | |
587 gnubiff | | 1 595 gpe-aerial | [] |
588 gnucash | [] [] [] | 9 596 gpe-beam | [] |
589 gnucash-glossary | [] [] [] | 8 597 gpe-calendar | [] |
590 gnupg | [] [] [] [] | 17 598 gpe-clock | [] [] [] |
591 gpe-aerial | [] [] | 7 599 gpe-conf | [] [] |
592 gpe-beam | [] [] | 8 600 gpe-contacts | [] |
593 gpe-calendar | [] [] [] [] [] | 13 601 gpe-edit | [] [] [] |
594 gpe-clock | [] [] [] | 9 602 gpe-filemanager | [] [] |
595 gpe-conf | [] [] [] | 9 603 gpe-go | [] [] [] |
596 gpe-contacts | [] [] [] [] | 11 604 gpe-login | [] [] [] |
597 gpe-edit | [] [] [] [] [] | 11 605 gpe-ownerinfo | [] [] |
598 gpe-go | [] | 5 606 gpe-package | [] [] |
599 gpe-login | [] [] [] [] [] | 12 607 gpe-sketchbook | [] [] |
600 gpe-ownerinfo | [] [] [] [] | 12 608 gpe-su | [] [] [] |
601 gpe-sketchbook | [] [] [] | 9 609 gpe-taskmanager | [] [] [] [] |
602 gpe-su | [] [] [] | 9 610 gpe-timesheet | [] |
603 gpe-taskmanager | [] [] [] | 9 611 gpe-today | [] [] |
604 gpe-timesheet | [] [] [] [] | 11 612 gpe-todo | [] |
605 gpe-today | [] [] [] [] [] | 12 613 gphoto2 | [] [] |
606 gpe-todo | [] [] [] [] [] | 12 614 gprof | |
607 gphoto2 | [] [] [] | 11 615 gpsdrive | () () () |
608 gprof | [] [] | 9 616 gramadoir | () |
609 gpsdrive | [] [] | 4 617 grep | [] [] [] [] |
610 gramadoir | | 3 618 gretl | |
611 grep | [] [] [] [] [] | 26 619 gsasl | [] |
612 gretl | | 2 620 gss | |
613 gtick | [] | 5 621 gst-plugins | [] |
614 hello | [] [] [] [] [] | 33 622 gst-plugins-base | |
615 id-utils | [] [] [] | 12 623 gst-plugins-good | [] |
616 indent | [] [] [] [] [] | 21 624 gstreamer | [] |
617 jpilot | [] [] [] [] [] | 9 625 gtick | |
618 jtag | [] | 1 626 gtkam | [] |
619 jwhois | () () [] [] | 11 627 gtkorphan | [] |
620 kbd | [] [] | 11 628 gtkspell | [] [] |
621 latrine | | 1 629 gutenprint | |
622 ld | [] [] | 5 630 hello | [] [] [] [] [] [] |
623 libc | [] [] [] [] | 20 631 id-utils | [] |
624 libgpewidget | [] [] [] | 12 632 impost | |
625 libiconv | [] [] [] [] [] [] [] [] [] | 27 633 indent | [] [] |
626 lifelines | [] | 2 634 iso_3166 | [] |
627 lilypond | [] | 3 635 iso_3166_2 | [] |
628 lingoteach | | 2 636 iso_4217 | [] [] [] |
629 lingoteach_lessons | () | 0 637 iso_639 | [] [] |
630 lynx | [] [] [] [] | 14 638 jpilot | () () () |
631 m4 | [] [] [] | 15 639 jtag | |
632 mailutils | [] | 4 640 jwhois | [] |
633 make | [] [] [] [] | 16 641 kbd | [] |
634 man-db | [] | 5 642 keytouch | [] |
635 minicom | [] | 11 643 keytouch-editor | |
636 mysecretdiary | [] [] | 10 644 keytouch-keyboa... | |
637 nano | [] [] [] [] [] | 17 645 latrine | [] |
638 nano_1_0 | [] [] [] [] | 17 646 ld | |
639 opcodes | [] [] | 6 647 leafpad | [] [] |
640 parted | [] [] [] | 15 648 libc | [] [] [] [] [] |
641 ptx | [] [] [] | 22 649 libexif | |
642 python | | 0 650 libextractor | |
643 radius | [] | 2 651 libgpewidget | [] |
644 recode | [] [] [] [] | 20 652 libgpg-error | |
645 screem | [] [] | 2 653 libgphoto2 | [] |
646 scrollkeeper | [] [] [] [] | 15 654 libgphoto2_port | [] |
647 sed | [] [] [] [] [] [] | 23 655 libgsasl | [] |
648 sh-utils | [] [] [] | 14 656 libiconv | |
649 shared-mime-info | [] [] | 4 657 libidn | [] [] |
650 sharutils | [] [] [] [] [] | 17 658 lifelines | [] |
651 sketch | [] | 6 659 lilypond | |
652 soundtracker | [] [] | 9 660 lingoteach | [] |
653 sp | [] | 3 661 lynx | [] [] |
654 tar | [] [] [] [] [] | 24 662 m4 | [] [] |
655 texinfo | [] [] [] [] | 14 663 mailutils | |
656 textutils | [] [] [] [] [] | 16 664 make | [] [] [] |
657 tin | | 1 665 man-db | () |
658 tuxpaint | [] [] [] [] [] | 29 666 minicom | [] |
659 util-linux | [] [] [] | 15 667 mysecretdiary | [] |
660 vorbis-tools | [] | 8 668 nano | [] [] [] |
661 wastesedge | | 0 669 nano_1_0 | [] [] [] |
662 wdiff | [] [] [] [] | 18 670 opcodes | [] |
663 wget | [] [] [] [] [] [] [] [] | 23 671 parted | [] [] |
664 xchat | [] [] [] [] [] | 14 672 pilot-qof | |
665 xfree86_xkb_xml | [] [] [] [] | 6 673 psmisc | [] [] [] |
666 xpad | | 4 674 pwdutils | |
667 +-------------------------------------------+ 675 python | |
668 51 teams ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW 676 qof | |
669 117 domains 58 41 16 16 78 0 53 12 1 10 21 22 1230 677 radius | |
678 recode | [] |
679 rpm | [] [] |
680 screem | [] |
681 scrollkeeper | [] [] [] [] |
682 sed | [] [] |
683 sh-utils | [] [] |
684 shared-mime-info | [] [] [] [] [] |
685 sharutils | [] [] |
686 shishi | |
687 silky | [] |
688 skencil | |
689 sketch | |
690 solfege | |
691 soundtracker | |
692 sp | () |
693 stardict | [] [] |
694 system-tools-ba... | [] [] [] [] |
695 tar | [] [] [] |
696 texinfo | [] [] [] |
697 textutils | [] [] [] |
698 tin | |
699 tp-robot | [] |
700 tuxpaint | [] |
701 unicode-han-tra... | |
702 unicode-transla... | |
703 util-linux | [] [] |
704 vorbis-tools | [] |
705 wastesedge | [] |
706 wdiff | [] [] |
707 wget | [] [] |
708 xchat | [] [] [] [] |
709 xkeyboard-config | [] |
710 xpad | [] [] [] |
711 +-------------------------------------------------+
712 ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no
713 52 24 2 2 1 3 0 2 3 21 0 15 1 97 5 1
714
715 nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta
716 +------------------------------------------------------+
717 GNUnet | |
718 a2ps | () [] [] [] [] [] [] |
719 aegis | () () |
720 ant-phone | [] [] |
721 anubis | [] [] [] |
722 ap-utils | () |
723 aspell | [] [] |
724 bash | [] [] [] |
725 batchelor | [] [] |
726 bfd | |
727 bibshelf | [] |
728 binutils | [] [] |
729 bison | [] [] [] [] [] |
730 bison-runtime | [] [] [] [] |
731 bluez-pin | [] [] [] [] [] [] [] [] [] |
732 cflow | [] |
733 clisp | [] |
734 console-tools | [] |
735 coreutils | [] [] [] [] |
736 cpio | [] [] [] |
737 cpplib | [] |
738 cryptonit | [] [] |
739 darkstat | [] [] [] [] [] [] |
740 dialog | [] [] [] [] [] [] [] [] [] |
741 diffutils | [] [] [] [] [] [] |
742 doodle | [] [] |
743 e2fsprogs | [] [] |
744 enscript | [] [] [] [] [] |
745 error | [] [] [] [] |
746 fetchmail | [] [] [] |
747 fileutils | [] [] [] [] [] |
748 findutils | [] [] [] [] [] [] |
749 flex | [] [] [] [] [] |
750 fslint | [] [] [] [] |
751 gas | |
752 gawk | [] [] [] [] |
753 gbiff | [] |
754 gcal | [] |
755 gcc | [] |
756 gettext-examples | [] [] [] [] [] [] [] [] |
757 gettext-runtime | [] [] [] [] [] [] [] [] |
758 gettext-tools | [] [] [] [] [] [] [] |
759 gimp-print | [] [] |
760 gip | [] [] [] [] |
761 gliv | [] [] [] [] |
762 glunarclock | [] [] [] [] [] [] |
763 gmult | [] [] [] [] |
764 gnubiff | () |
765 gnucash | () [] |
766 gnucash-glossary | [] [] [] |
767 gnuedu | |
768 gnulib | [] [] [] [] [] |
769 gnunet-gtk | [] |
770 gnutls | [] [] |
771 gpe-aerial | [] [] [] [] [] [] [] |
772 gpe-beam | [] [] [] [] [] [] [] |
773 gpe-calendar | [] |
774 gpe-clock | [] [] [] [] [] [] [] [] |
775 gpe-conf | [] [] [] [] [] [] [] |
776 gpe-contacts | [] [] [] [] [] |
777 gpe-edit | [] [] [] [] [] [] [] [] |
778 gpe-filemanager | [] [] |
779 gpe-go | [] [] [] [] [] [] |
780 gpe-login | [] [] [] [] [] [] [] [] |
781 gpe-ownerinfo | [] [] [] [] [] [] [] [] |
782 gpe-package | [] [] |
783 gpe-sketchbook | [] [] [] [] [] [] [] [] |
784 gpe-su | [] [] [] [] [] [] [] [] |
785 gpe-taskmanager | [] [] [] [] [] [] [] [] |
786 gpe-timesheet | [] [] [] [] [] [] [] [] |
787 gpe-today | [] [] [] [] [] [] [] [] |
788 gpe-todo | [] [] [] [] |
789 gphoto2 | [] [] [] [] [] |
790 gprof | [] [] [] |
791 gpsdrive | [] [] [] |
792 gramadoir | [] [] |
793 grep | [] [] [] [] [] [] [] [] |
794 gretl | [] |
795 gsasl | [] [] [] |
796 gss | [] [] [] |
797 gst-plugins | [] [] [] [] |
798 gst-plugins-base | [] |
799 gst-plugins-good | [] [] [] [] |
800 gstreamer | [] [] [] |
801 gtick | [] |
802 gtkam | [] [] [] [] |
803 gtkorphan | [] |
804 gtkspell | [] [] [] [] [] [] [] [] |
805 gutenprint | [] |
806 hello | [] [] [] [] [] [] [] [] |
807 id-utils | [] [] [] [] |
808 impost | [] |
809 indent | [] [] [] [] [] [] |
810 iso_3166 | [] [] [] [] [] [] |
811 iso_3166_2 | |
812 iso_4217 | [] [] [] [] |
813 iso_639 | [] [] [] [] |
814 jpilot | |
815 jtag | [] |
816 jwhois | [] [] [] [] |
817 kbd | [] [] [] |
818 keytouch | [] |
819 keytouch-editor | [] |
820 keytouch-keyboa... | [] |
821 latrine | [] [] |
822 ld | [] |
823 leafpad | [] [] [] [] [] [] |
824 libc | [] [] [] [] [] |
825 libexif | [] |
826 libextractor | [] [] |
827 libgpewidget | [] [] [] [] [] [] [] |
828 libgpg-error | [] [] |
829 libgphoto2 | [] |
830 libgphoto2_port | [] [] [] |
831 libgsasl | [] [] [] [] |
832 libiconv | [] [] |
833 libidn | [] [] () |
834 lifelines | [] [] |
835 lilypond | |
836 lingoteach | [] |
837 lynx | [] [] [] |
838 m4 | [] [] [] [] [] |
839 mailutils | [] [] [] [] |
840 make | [] [] [] [] |
841 man-db | [] [] |
842 minicom | [] [] [] [] [] |
843 mysecretdiary | [] [] [] [] |
844 nano | [] [] [] |
845 nano_1_0 | [] [] [] [] |
846 opcodes | [] [] |
847 parted | [] |
848 pilot-qof | [] |
849 psmisc | [] [] |
850 pwdutils | [] [] |
851 python | |
852 qof | [] [] |
853 radius | [] [] |
854 recode | [] [] [] [] [] [] [] |
855 rpm | [] [] [] [] |
856 screem | |
857 scrollkeeper | [] [] [] [] [] [] [] |
858 sed | [] [] [] [] [] [] [] [] [] |
859 sh-utils | [] [] [] |
860 shared-mime-info | [] [] [] [] [] |
861 sharutils | [] [] [] [] |
862 shishi | [] |
863 silky | [] |
864 skencil | [] [] [] |
865 sketch | [] [] [] |
866 solfege | [] |
867 soundtracker | [] [] |
868 sp | |
869 stardict | [] [] [] |
870 system-tools-ba... | [] [] [] [] [] [] [] [] [] |
871 tar | [] [] [] [] [] |
872 texinfo | [] [] [] [] |
873 textutils | [] [] [] |
874 tin | () |
875 tp-robot | [] |
876 tuxpaint | [] [] [] [] [] |
877 unicode-han-tra... | |
878 unicode-transla... | |
879 util-linux | [] [] [] [] |
880 vorbis-tools | [] [] |
881 wastesedge | |
882 wdiff | [] [] [] [] [] [] |
883 wget | [] [] [] [] |
884 xchat | [] [] [] [] [] [] [] |
885 xkeyboard-config | [] [] |
886 xpad | [] [] [] |
887 +------------------------------------------------------+
888 nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta
889 0 2 3 58 30 54 5 73 72 4 40 46 11 50 128 2
890
891 tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu
892 +---------------------------------------------------+
893 GNUnet | [] | 2
894 a2ps | [] [] [] | 19
895 aegis | | 0
896 ant-phone | [] [] | 6
897 anubis | [] [] [] | 11
898 ap-utils | () [] | 4
899 aspell | [] [] [] | 15
900 bash | [] | 11
901 batchelor | [] [] | 9
902 bfd | | 1
903 bibshelf | [] | 7
904 binutils | [] [] [] | 9
905 bison | [] [] [] | 19
906 bison-runtime | [] [] [] | 15
907 bluez-pin | [] [] [] [] [] [] | 28
908 cflow | [] [] | 5
909 clisp | | 6
910 console-tools | [] [] | 5
911 coreutils | [] [] | 16
912 cpio | [] [] [] | 9
913 cpplib | [] [] [] [] | 11
914 cryptonit | | 5
915 darkstat | [] () () | 15
916 dialog | [] [] [] [] [] | 30
917 diffutils | [] [] [] [] | 28
918 doodle | [] | 6
919 e2fsprogs | [] [] | 10
920 enscript | [] [] [] | 16
921 error | [] [] [] [] | 18
922 fetchmail | [] [] | 12
923 fileutils | [] [] [] | 18
924 findutils | [] [] [] | 17
925 flex | [] [] | 15
926 fslint | [] | 9
927 gas | [] | 3
928 gawk | [] [] | 15
929 gbiff | [] | 5
930 gcal | [] | 5
931 gcc | [] [] [] | 6
932 gettext-examples | [] [] [] [] [] [] | 27
933 gettext-runtime | [] [] [] [] [] [] | 28
934 gettext-tools | [] [] [] [] [] | 19
935 gimp-print | [] [] | 12
936 gip | [] [] | 12
937 gliv | [] [] | 8
938 glunarclock | [] [] [] | 15
939 gmult | [] [] [] [] | 15
940 gnubiff | [] | 1
941 gnucash | () | 2
942 gnucash-glossary | [] [] | 9
943 gnuedu | [] | 2
944 gnulib | [] [] [] [] [] | 28
945 gnunet-gtk | | 1
946 gnutls | | 2
947 gpe-aerial | [] [] | 14
948 gpe-beam | [] [] | 14
949 gpe-calendar | [] | 3
950 gpe-clock | [] [] [] [] | 21
951 gpe-conf | [] [] | 14
952 gpe-contacts | [] [] | 10
953 gpe-edit | [] [] [] [] | 20
954 gpe-filemanager | [] | 6
955 gpe-go | [] [] | 15
956 gpe-login | [] [] [] [] [] | 21
957 gpe-ownerinfo | [] [] [] [] | 21
958 gpe-package | [] | 6
959 gpe-sketchbook | [] [] | 16
960 gpe-su | [] [] [] | 20
961 gpe-taskmanager | [] [] [] | 20
962 gpe-timesheet | [] [] [] [] | 18
963 gpe-today | [] [] [] [] [] | 21
964 gpe-todo | [] | 7
965 gphoto2 | [] [] [] [] | 20
966 gprof | [] [] | 11
967 gpsdrive | | 4
968 gramadoir | [] | 7
969 grep | [] [] [] [] | 34
970 gretl | | 4
971 gsasl | [] [] | 8
972 gss | [] | 5
973 gst-plugins | [] [] [] | 15
974 gst-plugins-base | [] [] [] | 9
975 gst-plugins-good | [] [] [] [] [] | 20
976 gstreamer | [] [] [] | 17
977 gtick | [] | 3
978 gtkam | [] | 13
979 gtkorphan | [] | 7
980 gtkspell | [] [] [] [] [] [] | 26
981 gutenprint | | 3
982 hello | [] [] [] [] [] | 37
983 id-utils | [] [] | 14
984 impost | [] | 4
985 indent | [] [] [] [] | 25
986 iso_3166 | [] [] [] [] | 16
987 iso_3166_2 | | 2
988 iso_4217 | [] [] | 14
989 iso_639 | [] | 14
990 jpilot | [] [] [] [] | 7
991 jtag | [] | 3
992 jwhois | [] [] [] | 13
993 kbd | [] [] | 12
994 keytouch | [] | 4
995 keytouch-editor | | 2
996 keytouch-keyboa... | [] | 3
997 latrine | [] [] | 8
998 ld | [] [] [] [] | 8
999 leafpad | [] [] [] [] | 23
1000 libc | [] [] [] | 23
1001 libexif | [] | 4
1002 libextractor | [] | 5
1003 libgpewidget | [] [] [] | 19
1004 libgpg-error | [] | 4
1005 libgphoto2 | [] | 8
1006 libgphoto2_port | [] [] [] | 11
1007 libgsasl | [] | 8
1008 libiconv | [] | 7
1009 libidn | [] [] | 10
1010 lifelines | | 4
1011 lilypond | | 2
1012 lingoteach | [] | 6
1013 lynx | [] [] [] | 15
1014 m4 | [] [] [] | 18
1015 mailutils | [] | 8
1016 make | [] [] [] | 20
1017 man-db | [] | 6
1018 minicom | [] | 14
1019 mysecretdiary | [] [] | 12
1020 nano | [] [] | 17
1021 nano_1_0 | [] [] [] | 18
1022 opcodes | [] [] | 10
1023 parted | [] [] [] | 10
1024 pilot-qof | [] | 3
1025 psmisc | [] | 10
1026 pwdutils | [] | 3
1027 python | | 0
1028 qof | [] | 4
1029 radius | [] | 6
1030 recode | [] [] [] | 25
1031 rpm | [] [] [] [] | 14
1032 screem | [] | 2
1033 scrollkeeper | [] [] [] [] | 26
1034 sed | [] [] [] | 22
1035 sh-utils | [] | 15
1036 shared-mime-info | [] [] [] [] | 24
1037 sharutils | [] [] [] | 23
1038 shishi | | 1
1039 silky | [] | 4
1040 skencil | [] | 7
1041 sketch | | 6
1042 solfege | | 2
1043 soundtracker | [] [] | 9
1044 sp | [] | 3
1045 stardict | [] [] [] [] | 11
1046 system-tools-ba... | [] [] [] [] [] [] [] | 37
1047 tar | [] [] [] [] | 20
1048 texinfo | [] [] [] | 15
1049 textutils | [] [] [] | 17
1050 tin | | 1
1051 tp-robot | [] [] [] | 10
1052 tuxpaint | [] [] [] | 16
1053 unicode-han-tra... | | 0
1054 unicode-transla... | | 2
1055 util-linux | [] [] [] | 20
1056 vorbis-tools | [] [] | 11
1057 wastesedge | | 1
1058 wdiff | [] [] | 22
1059 wget | [] [] [] | 19
1060 xchat | [] [] [] [] | 29
1061 xkeyboard-config | [] [] [] [] | 11
1062 xpad | [] [] [] | 14
1063 +---------------------------------------------------+
1064 77 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu
1065 170 domains 0 1 1 77 39 0 136 10 1 48 5 54 0 2028
670 1066
671 Some counters in the preceding matrix are higher than the number of 1067 Some counters in the preceding matrix are higher than the number of
672visible blocks let us expect. This is because a few extra PO files are 1068visible blocks let us expect. This is because a few extra PO files are
@@ -679,13 +1075,13 @@ distributed as such by its maintainer. There might be an observable
679lag between the mere existence a PO file and its wide availability in a 1075lag between the mere existence a PO file and its wide availability in a
680distribution. 1076distribution.
681 1077
682 If November 2003 seems to be old, you may fetch a more recent copy 1078 If October 2006 seems to be old, you may fetch a more recent copy of
683of this `ABOUT-NLS' file on most GNU archive sites. The most 1079this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date
684up-to-date matrix with full percentage details can be found at 1080matrix with full percentage details can be found at
685`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. 1081`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
686 1082
687Using `gettext' in new packages 10831.6 Using `gettext' in new packages
688=============================== 1084===================================
689 1085
690If you are writing a freely available program and want to 1086If you are writing a freely available program and want to
691internationalize it you are welcome to use GNU `gettext' in your 1087internationalize it you are welcome to use GNU `gettext' in your
diff --git a/ChangeLog b/ChangeLog
index 9849b9e3..33e6cb59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
1Thu Feb 8 13:40:11 MST 2007
2 Upgrade to gettext-0.16.1.
3 Minor bugfix in build process (#1182).
4
1Sat Feb 3 22:03:52 MST 2007 5Sat Feb 3 22:03:52 MST 2007
2 Added ability to open gnunet-directory. 6 Added ability to open gnunet-directory.
3 7
diff --git a/configure.ac b/configure.ac
index 2748fffe..829f7d28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,7 +149,7 @@ AC_C_CONST
149AC_TYPE_PID_T 149AC_TYPE_PID_T
150 150
151# check for gettext 151# check for gettext
152AM_GNU_GETTEXT_VERSION([0.13]) 152AM_GNU_GETTEXT_VERSION([0.16.1])
153AM_GNU_GETTEXT([external]) 153AM_GNU_GETTEXT([external])
154 154
155# test for GNUnet core 155# test for GNUnet core
diff --git a/m4/codeset.m4 b/m4/codeset.m4
index 59535ebc..223955b4 100644
--- a/m4/codeset.m4
+++ b/m4/codeset.m4
@@ -1,10 +1,8 @@
1# codeset.m4 serial AM1 (gettext-0.10.40) 1# codeset.m4 serial 2 (gettext-0.16)
2dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. 2dnl Copyright (C) 2000-2002, 2006 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10 8
@@ -12,7 +10,7 @@ AC_DEFUN([AM_LANGINFO_CODESET],
12[ 10[
13 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,
14 [AC_TRY_LINK([#include <langinfo.h>], 12 [AC_TRY_LINK([#include <langinfo.h>],
15 [char* cs = nl_langinfo(CODESET);], 13 [char* cs = nl_langinfo(CODESET); return !cs;],
16 am_cv_langinfo_codeset=yes, 14 am_cv_langinfo_codeset=yes,
17 am_cv_langinfo_codeset=no) 15 am_cv_langinfo_codeset=no)
18 ]) 16 ])
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index a374f03f..91c345e9 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -1,10 +1,8 @@
1# gettext.m4 serial 28 (gettext-0.13) 1# gettext.m4 serial 59 (gettext-0.16.1)
2dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8dnl 6dnl
9dnl This file can can be used in projects which are not available under 7dnl This file can can be used in projects which are not available under
10dnl the GNU General Public License or the GNU Library General Public 8dnl the GNU General Public License or the GNU Library General Public
@@ -17,7 +15,7 @@ dnl They are *not* in the public domain.
17 15
18dnl Authors: 16dnl Authors:
19dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. 17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
20dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. 18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006.
21 19
22dnl Macro to add for using GNU gettext. 20dnl Macro to add for using GNU gettext.
23 21
@@ -65,8 +63,13 @@ AC_DEFUN([AM_GNU_GETTEXT],
65 ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , 63 ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
66 [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT 64 [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
67])])])]) 65])])])])
68 define(gt_included_intl, ifelse([$1], [external], [no], [yes])) 66 define([gt_included_intl],
69 define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], [])) 67 ifelse([$1], [external],
68 ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
69 [yes]))
70 define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
71 gt_NEEDS_INIT
72 AM_GNU_GETTEXT_NEED([$2])
70 73
71 AC_REQUIRE([AM_PO_SUBDIRS])dnl 74 AC_REQUIRE([AM_PO_SUBDIRS])dnl
72 ifelse(gt_included_intl, yes, [ 75 ifelse(gt_included_intl, yes, [
@@ -80,7 +83,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
80 dnl Sometimes libintl requires libiconv, so first search for libiconv. 83 dnl Sometimes libintl requires libiconv, so first search for libiconv.
81 dnl Ideally we would do this search only after the 84 dnl Ideally we would do this search only after the
82 dnl if test "$USE_NLS" = "yes"; then 85 dnl if test "$USE_NLS" = "yes"; then
83 dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then 86 dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
84 dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT 87 dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
85 dnl the configure script would need to contain the same shell code 88 dnl the configure script would need to contain the same shell code
86 dnl again, outside any 'if'. There are two solutions: 89 dnl again, outside any 'if'. There are two solutions:
@@ -92,8 +95,11 @@ AC_DEFUN([AM_GNU_GETTEXT],
92 AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) 95 AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
93 ]) 96 ])
94 97
98 dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
99 gt_INTL_MACOSX
100
95 dnl Set USE_NLS. 101 dnl Set USE_NLS.
96 AM_NLS 102 AC_REQUIRE([AM_NLS])
97 103
98 ifelse(gt_included_intl, yes, [ 104 ifelse(gt_included_intl, yes, [
99 BUILD_INCLUDED_LIBINTL=no 105 BUILD_INCLUDED_LIBINTL=no
@@ -103,6 +109,15 @@ AC_DEFUN([AM_GNU_GETTEXT],
103 LTLIBINTL= 109 LTLIBINTL=
104 POSUB= 110 POSUB=
105 111
112 dnl Add a version number to the cache macros.
113 case " $gt_needs " in
114 *" need-formatstring-macros "*) gt_api_version=3 ;;
115 *" need-ngettext "*) gt_api_version=2 ;;
116 *) gt_api_version=1 ;;
117 esac
118 gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
119 gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
120
106 dnl If we use NLS figure out what method 121 dnl If we use NLS figure out what method
107 if test "$USE_NLS" = "yes"; then 122 if test "$USE_NLS" = "yes"; then
108 gt_use_preinstalled_gnugettext=no 123 gt_use_preinstalled_gnugettext=no
@@ -121,28 +136,35 @@ AC_DEFUN([AM_GNU_GETTEXT],
121 dnl to use. If GNU gettext is available we use this. Else we have 136 dnl to use. If GNU gettext is available we use this. Else we have
122 dnl to fall back to GNU NLS library. 137 dnl to fall back to GNU NLS library.
123 138
124 dnl Add a version number to the cache macros. 139 if test $gt_api_version -ge 3; then
125 define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1))) 140 gt_revision_test_code='
126 define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc]) 141#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
127 define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
128
129 AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
130 [AC_TRY_LINK([#include <libintl.h>
131]ifelse([$2], [need-formatstring-macros],
132[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
133#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) 142#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
134#endif 143#endif
135changequote(,)dnl 144changequote(,)dnl
136typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; 145typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
137changequote([,])dnl 146changequote([,])dnl
138], [])[extern int _nl_msg_cat_cntr; 147'
148 else
149 gt_revision_test_code=
150 fi
151 if test $gt_api_version -ge 2; then
152 gt_expression_test_code=' + * ngettext ("", "", 0)'
153 else
154 gt_expression_test_code=
155 fi
156
157 AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
158 [AC_TRY_LINK([#include <libintl.h>
159$gt_revision_test_code
160extern int _nl_msg_cat_cntr;
139extern int *_nl_domain_bindings;], 161extern int *_nl_domain_bindings;],
140 [bindtextdomain ("", ""); 162 [bindtextdomain ("", "");
141return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], 163return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
142 gt_cv_func_gnugettext_libc=yes, 164 [eval "$gt_func_gnugettext_libc=yes"],
143 gt_cv_func_gnugettext_libc=no)]) 165 [eval "$gt_func_gnugettext_libc=no"])])
144 166
145 if test "$gt_cv_func_gnugettext_libc" != "yes"; then 167 if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
146 dnl Sometimes libintl requires libiconv, so first search for libiconv. 168 dnl Sometimes libintl requires libiconv, so first search for libiconv.
147 ifelse(gt_included_intl, yes, , [ 169 ifelse(gt_included_intl, yes, , [
148 AM_ICONV_LINK 170 AM_ICONV_LINK
@@ -153,52 +175,40 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
153 dnl even if libiconv doesn't exist. 175 dnl even if libiconv doesn't exist.
154 AC_LIB_LINKFLAGS_BODY([intl]) 176 AC_LIB_LINKFLAGS_BODY([intl])
155 AC_CACHE_CHECK([for GNU gettext in libintl], 177 AC_CACHE_CHECK([for GNU gettext in libintl],
156 gt_cv_func_gnugettext_libintl, 178 [$gt_func_gnugettext_libintl],
157 [gt_save_CPPFLAGS="$CPPFLAGS" 179 [gt_save_CPPFLAGS="$CPPFLAGS"
158 CPPFLAGS="$CPPFLAGS $INCINTL" 180 CPPFLAGS="$CPPFLAGS $INCINTL"
159 gt_save_LIBS="$LIBS" 181 gt_save_LIBS="$LIBS"
160 LIBS="$LIBS $LIBINTL" 182 LIBS="$LIBS $LIBINTL"
161 dnl Now see whether libintl exists and does not depend on libiconv. 183 dnl Now see whether libintl exists and does not depend on libiconv.
162 AC_TRY_LINK([#include <libintl.h> 184 AC_TRY_LINK([#include <libintl.h>
163]ifelse([$2], [need-formatstring-macros], 185$gt_revision_test_code
164[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION 186extern int _nl_msg_cat_cntr;
165#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
166#endif
167changequote(,)dnl
168typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
169changequote([,])dnl
170], [])[extern int _nl_msg_cat_cntr;
171extern 187extern
172#ifdef __cplusplus 188#ifdef __cplusplus
173"C" 189"C"
174#endif 190#endif
175const char *_nl_expand_alias ();], 191const char *_nl_expand_alias (const char *);],
176 [bindtextdomain ("", ""); 192 [bindtextdomain ("", "");
177return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], 193return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
178 gt_cv_func_gnugettext_libintl=yes, 194 [eval "$gt_func_gnugettext_libintl=yes"],
179 gt_cv_func_gnugettext_libintl=no) 195 [eval "$gt_func_gnugettext_libintl=no"])
180 dnl Now see whether libintl exists and depends on libiconv. 196 dnl Now see whether libintl exists and depends on libiconv.
181 if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then 197 if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
182 LIBS="$LIBS $LIBICONV" 198 LIBS="$LIBS $LIBICONV"
183 AC_TRY_LINK([#include <libintl.h> 199 AC_TRY_LINK([#include <libintl.h>
184]ifelse([$2], [need-formatstring-macros], 200$gt_revision_test_code
185[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION 201extern int _nl_msg_cat_cntr;
186#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
187#endif
188changequote(,)dnl
189typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
190changequote([,])dnl
191], [])[extern int _nl_msg_cat_cntr;
192extern 202extern
193#ifdef __cplusplus 203#ifdef __cplusplus
194"C" 204"C"
195#endif 205#endif
196const char *_nl_expand_alias ();], 206const char *_nl_expand_alias (const char *);],
197 [bindtextdomain ("", ""); 207 [bindtextdomain ("", "");
198return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], 208return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
199 [LIBINTL="$LIBINTL $LIBICONV" 209 [LIBINTL="$LIBINTL $LIBICONV"
200 LTLIBINTL="$LTLIBINTL $LTLIBICONV" 210 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
201 gt_cv_func_gnugettext_libintl=yes 211 eval "$gt_func_gnugettext_libintl=yes"
202 ]) 212 ])
203 fi 213 fi
204 CPPFLAGS="$gt_save_CPPFLAGS" 214 CPPFLAGS="$gt_save_CPPFLAGS"
@@ -209,8 +219,8 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
209 dnl use it. But if this macro is used in GNU gettext, and GNU 219 dnl use it. But if this macro is used in GNU gettext, and GNU
210 dnl gettext is already preinstalled in libintl, we update this 220 dnl gettext is already preinstalled in libintl, we update this
211 dnl libintl. (Cf. the install rule in intl/Makefile.in.) 221 dnl libintl. (Cf. the install rule in intl/Makefile.in.)
212 if test "$gt_cv_func_gnugettext_libc" = "yes" \ 222 if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
213 || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ 223 || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
214 && test "$PACKAGE" != gettext-runtime \ 224 && test "$PACKAGE" != gettext-runtime \
215 && test "$PACKAGE" != gettext-tools; }; then 225 && test "$PACKAGE" != gettext-tools; }; then
216 gt_use_preinstalled_gnugettext=yes 226 gt_use_preinstalled_gnugettext=yes
@@ -233,11 +243,12 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
233 dnl Mark actions used to generate GNU NLS library. 243 dnl Mark actions used to generate GNU NLS library.
234 BUILD_INCLUDED_LIBINTL=yes 244 BUILD_INCLUDED_LIBINTL=yes
235 USE_INCLUDED_LIBINTL=yes 245 USE_INCLUDED_LIBINTL=yes
236 LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" 246 LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
237 LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV" 247 LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
238 LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` 248 LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
239 fi 249 fi
240 250
251 CATOBJEXT=
241 if test "$gt_use_preinstalled_gnugettext" = "yes" \ 252 if test "$gt_use_preinstalled_gnugettext" = "yes" \
242 || test "$nls_cv_use_gnu_gettext" = "yes"; then 253 || test "$nls_cv_use_gnu_gettext" = "yes"; then
243 dnl Mark actions to use GNU gettext tools. 254 dnl Mark actions to use GNU gettext tools.
@@ -245,6 +256,15 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
245 fi 256 fi
246 ]) 257 ])
247 258
259 if test -n "$INTL_MACOSX_LIBS"; then
260 if test "$gt_use_preinstalled_gnugettext" = "yes" \
261 || test "$nls_cv_use_gnu_gettext" = "yes"; then
262 dnl Some extra flags are needed during linking.
263 LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
264 LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
265 fi
266 fi
267
248 if test "$gt_use_preinstalled_gnugettext" = "yes" \ 268 if test "$gt_use_preinstalled_gnugettext" = "yes" \
249 || test "$nls_cv_use_gnu_gettext" = "yes"; then 269 || test "$nls_cv_use_gnu_gettext" = "yes"; then
250 AC_DEFINE(ENABLE_NLS, 1, 270 AC_DEFINE(ENABLE_NLS, 1,
@@ -260,7 +280,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
260 if test "$USE_NLS" = "yes"; then 280 if test "$USE_NLS" = "yes"; then
261 AC_MSG_CHECKING([where the gettext function comes from]) 281 AC_MSG_CHECKING([where the gettext function comes from])
262 if test "$gt_use_preinstalled_gnugettext" = "yes"; then 282 if test "$gt_use_preinstalled_gnugettext" = "yes"; then
263 if test "$gt_cv_func_gnugettext_libintl" = "yes"; then 283 if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
264 gt_source="external libintl" 284 gt_source="external libintl"
265 else 285 else
266 gt_source="libc" 286 gt_source="libc"
@@ -274,7 +294,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
274 if test "$USE_NLS" = "yes"; then 294 if test "$USE_NLS" = "yes"; then
275 295
276 if test "$gt_use_preinstalled_gnugettext" = "yes"; then 296 if test "$gt_use_preinstalled_gnugettext" = "yes"; then
277 if test "$gt_cv_func_gnugettext_libintl" = "yes"; then 297 if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
278 AC_MSG_CHECKING([how to link with libintl]) 298 AC_MSG_CHECKING([how to link with libintl])
279 AC_MSG_RESULT([$LIBINTL]) 299 AC_MSG_RESULT([$LIBINTL])
280 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) 300 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
@@ -320,6 +340,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
320 AC_SUBST(GENCAT) 340 AC_SUBST(GENCAT)
321 341
322 dnl For backward compatibility. Some Makefiles may be using this. 342 dnl For backward compatibility. Some Makefiles may be using this.
343 INTLOBJS=
323 if test "$USE_INCLUDED_LIBINTL" = yes; then 344 if test "$USE_INCLUDED_LIBINTL" = yes; then
324 INTLOBJS="\$(GETTOBJS)" 345 INTLOBJS="\$(GETTOBJS)"
325 fi 346 fi
@@ -341,145 +362,56 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
341]) 362])
342 363
343 364
344dnl Checks for all prerequisites of the intl subdirectory, 365dnl Checks for special options needed on MacOS X.
345dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, 366dnl Defines INTL_MACOSX_LIBS.
346dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. 367AC_DEFUN([gt_INTL_MACOSX],
347AC_DEFUN([AM_INTL_SUBDIR],
348[ 368[
349 AC_REQUIRE([AC_PROG_INSTALL])dnl 369 dnl Check for API introduced in MacOS X 10.2.
350 AC_REQUIRE([AM_MKINSTALLDIRS])dnl 370 AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
351 AC_REQUIRE([AC_PROG_CC])dnl 371 gt_cv_func_CFPreferencesCopyAppValue,
352 AC_REQUIRE([AC_CANONICAL_HOST])dnl 372 [gt_save_LIBS="$LIBS"
353 AC_REQUIRE([AC_PROG_RANLIB])dnl 373 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
354 AC_REQUIRE([AC_ISC_POSIX])dnl 374 AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
355 AC_REQUIRE([AC_HEADER_STDC])dnl 375 [CFPreferencesCopyAppValue(NULL, NULL)],
356 AC_REQUIRE([AC_C_CONST])dnl 376 [gt_cv_func_CFPreferencesCopyAppValue=yes],
357 AC_REQUIRE([bh_C_SIGNED])dnl 377 [gt_cv_func_CFPreferencesCopyAppValue=no])
358 AC_REQUIRE([AC_C_INLINE])dnl 378 LIBS="$gt_save_LIBS"])
359 AC_REQUIRE([AC_TYPE_OFF_T])dnl 379 if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
360 AC_REQUIRE([AC_TYPE_SIZE_T])dnl 380 AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
361 AC_REQUIRE([jm_AC_TYPE_LONG_LONG])dnl 381 [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
362 AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
363 AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
364 AC_REQUIRE([gt_TYPE_WINT_T])dnl
365 AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
366 AC_REQUIRE([jm_AC_HEADER_STDINT_H])
367 AC_REQUIRE([gt_TYPE_INTMAX_T])
368 AC_REQUIRE([gt_PRINTF_POSIX])
369 AC_REQUIRE([AC_FUNC_ALLOCA])dnl
370 AC_REQUIRE([AC_FUNC_MMAP])dnl
371 AC_REQUIRE([jm_GLIBC21])dnl
372 AC_REQUIRE([gt_INTDIV0])dnl
373 AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
374 AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
375 AC_REQUIRE([gt_INTTYPES_PRI])dnl
376 AC_REQUIRE([gl_XSIZE])dnl
377
378 AC_CHECK_TYPE([ptrdiff_t], ,
379 [AC_DEFINE([ptrdiff_t], [long],
380 [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
381 ])
382 AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
383stdlib.h string.h unistd.h sys/param.h])
384 AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \
385mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
386strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
387__fsetlocking])
388
389 dnl Use the _snprintf function only if it is declared (because on NetBSD it
390 dnl is defined as a weak alias of snprintf; we prefer to use the latter).
391 gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
392 gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
393
394 dnl Use the *_unlocked functions only if they are declared.
395 dnl (because some of them were defined without being declared in Solaris
396 dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
397 dnl on Solaris 2.5.1 to run on Solaris 2.6).
398 dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
399 gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
400 gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
401 gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
402
403 case $gt_cv_func_printf_posix in
404 *yes) HAVE_POSIX_PRINTF=1 ;;
405 *) HAVE_POSIX_PRINTF=0 ;;
406 esac
407 AC_SUBST([HAVE_POSIX_PRINTF])
408 if test "$ac_cv_func_asprintf" = yes; then
409 HAVE_ASPRINTF=1
410 else
411 HAVE_ASPRINTF=0
412 fi 382 fi
413 AC_SUBST([HAVE_ASPRINTF]) 383 dnl Check for API introduced in MacOS X 10.3.
414 if test "$ac_cv_func_snprintf" = yes; then 384 AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
415 HAVE_SNPRINTF=1 385 [gt_save_LIBS="$LIBS"
416 else 386 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
417 HAVE_SNPRINTF=0 387 AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
388 [gt_cv_func_CFLocaleCopyCurrent=yes],
389 [gt_cv_func_CFLocaleCopyCurrent=no])
390 LIBS="$gt_save_LIBS"])
391 if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
392 AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
393 [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
418 fi 394 fi
419 AC_SUBST([HAVE_SNPRINTF]) 395 INTL_MACOSX_LIBS=
420 if test "$ac_cv_func_wprintf" = yes; then 396 if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
421 HAVE_WPRINTF=1 397 INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
422 else
423 HAVE_WPRINTF=0
424 fi 398 fi
425 AC_SUBST([HAVE_WPRINTF]) 399 AC_SUBST([INTL_MACOSX_LIBS])
400])
426 401
427 AM_ICONV
428 AM_LANGINFO_CODESET
429 if test $ac_cv_header_locale_h = yes; then
430 AM_LC_MESSAGES
431 fi
432 402
433 dnl intl/plural.c is generated from intl/plural.y. It requires bison, 403dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
434 dnl because plural.y uses bison specific features. It requires at least 404m4_define([gt_NEEDS_INIT],
435 dnl bison-1.26 because earlier versions generate a plural.c that doesn't 405[
436 dnl compile. 406 m4_divert_text([DEFAULTS], [gt_needs=])
437 dnl bison is only needed for the maintainer (who touches plural.y). But in 407 m4_define([gt_NEEDS_INIT], [])
438 dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
439 dnl the rule in general Makefile. Now, some people carelessly touch the
440 dnl files or have a broken "make" program, hence the plural.c rule will
441 dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
442 dnl present or too old.
443 AC_CHECK_PROGS([INTLBISON], [bison])
444 if test -z "$INTLBISON"; then
445 ac_verc_fail=yes
446 else
447 dnl Found it, now check the version.
448 AC_MSG_CHECKING([version of bison])
449changequote(<<,>>)dnl
450 ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
451 case $ac_prog_version in
452 '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
453 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
454changequote([,])dnl
455 ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
456 *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
457 esac
458 AC_MSG_RESULT([$ac_prog_version])
459 fi
460 if test $ac_verc_fail = yes; then
461 INTLBISON=:
462 fi
463]) 408])
464 409
465 410
466dnl gt_CHECK_DECL(FUNC, INCLUDES) 411dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
467dnl Check whether a function is declared. 412AC_DEFUN([AM_GNU_GETTEXT_NEED],
468AC_DEFUN([gt_CHECK_DECL],
469[ 413[
470 AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1, 414 m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
471 [AC_TRY_COMPILE([$2], [
472#ifndef $1
473 char *p = (char *) $1;
474#endif
475], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
476 if test $ac_cv_have_decl_$1 = yes; then
477 gt_value=1
478 else
479 gt_value=0
480 fi
481 AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
482 [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
483]) 415])
484 416
485 417
diff --git a/m4/glibc21.m4 b/m4/glibc21.m4
index 9c9f3db3..d95fd986 100644
--- a/m4/glibc21.m4
+++ b/m4/glibc21.m4
@@ -1,15 +1,13 @@
1# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40) 1# glibc21.m4 serial 3
2dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. 2dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9# Test for the GNU C Library, version 2.1 or newer. 7# Test for the GNU C Library, version 2.1 or newer.
10# From Bruno Haible. 8# From Bruno Haible.
11 9
12AC_DEFUN([jm_GLIBC21], 10AC_DEFUN([gl_GLIBC21],
13 [ 11 [
14 AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, 12 AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
15 ac_cv_gnu_library_2_1, 13 ac_cv_gnu_library_2_1,
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index c5f35798..654c4158 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -1,10 +1,8 @@
1# iconv.m4 serial AM4 (gettext-0.11.3) 1# iconv.m4 serial AM4 (gettext-0.11.3)
2dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. 2dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10 8
diff --git a/m4/intdiv0.m4 b/m4/intdiv0.m4
index 55dddcf1..b8d78176 100644
--- a/m4/intdiv0.m4
+++ b/m4/intdiv0.m4
@@ -1,10 +1,8 @@
1# intdiv0.m4 serial 1 (gettext-0.11.3) 1# intdiv0.m4 serial 1 (gettext-0.11.3)
2dnl Copyright (C) 2002 Free Software Foundation, Inc. 2dnl Copyright (C) 2002 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10 8
diff --git a/m4/intmax.m4 b/m4/intmax.m4
index dfb08ccc..ce7a8a49 100644
--- a/m4/intmax.m4
+++ b/m4/intmax.m4
@@ -1,10 +1,8 @@
1# intmax.m4 serial 1 (gettext-0.12) 1# intmax.m4 serial 3 (gettext-0.16)
2dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 2002-2005 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10dnl Test whether the system has the 'intmax_t' type, but don't attempt to 8dnl Test whether the system has the 'intmax_t' type, but don't attempt to
@@ -12,11 +10,11 @@ dnl find a replacement if it is lacking.
12 10
13AC_DEFUN([gt_TYPE_INTMAX_T], 11AC_DEFUN([gt_TYPE_INTMAX_T],
14[ 12[
15 AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) 13 AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
16 AC_REQUIRE([jm_AC_HEADER_STDINT_H]) 14 AC_REQUIRE([gl_AC_HEADER_STDINT_H])
17 AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t, 15 AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
18 [AC_TRY_COMPILE([ 16 [AC_TRY_COMPILE([
19#include <stddef.h> 17#include <stddef.h>
20#include <stdlib.h> 18#include <stdlib.h>
21#if HAVE_STDINT_H_WITH_UINTMAX 19#if HAVE_STDINT_H_WITH_UINTMAX
22#include <stdint.h> 20#include <stdint.h>
@@ -24,7 +22,10 @@ AC_DEFUN([gt_TYPE_INTMAX_T],
24#if HAVE_INTTYPES_H_WITH_UINTMAX 22#if HAVE_INTTYPES_H_WITH_UINTMAX
25#include <inttypes.h> 23#include <inttypes.h>
26#endif 24#endif
27], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)]) 25], [intmax_t x = -1;
26 return !x;],
27 gt_cv_c_intmax_t=yes,
28 gt_cv_c_intmax_t=no)])
28 if test $gt_cv_c_intmax_t = yes; then 29 if test $gt_cv_c_intmax_t = yes; then
29 AC_DEFINE(HAVE_INTMAX_T, 1, 30 AC_DEFINE(HAVE_INTMAX_T, 1,
30 [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.]) 31 [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4
index fd007c31..7c7f8940 100644
--- a/m4/inttypes-pri.m4
+++ b/m4/inttypes-pri.m4
@@ -1,20 +1,20 @@
1# inttypes-pri.m4 serial 1 (gettext-0.11.4) 1# inttypes-pri.m4 serial 4 (gettext-0.16)
2dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. 2dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10 8
9AC_PREREQ(2.52)
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.
13 13
14AC_DEFUN([gt_INTTYPES_PRI], 14AC_DEFUN([gt_INTTYPES_PRI],
15[ 15[
16 AC_REQUIRE([gt_HEADER_INTTYPES_H]) 16 AC_CHECK_HEADERS([inttypes.h])
17 if test $gt_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 [
@@ -28,5 +28,9 @@ char *p = PRId32;
28 if test "$gt_cv_inttypes_pri_broken" = yes; then 28 if test "$gt_cv_inttypes_pri_broken" = yes; then
29 AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, 29 AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
30 [Define if <inttypes.h> exists and defines unusable PRI* macros.]) 30 [Define if <inttypes.h> exists and defines unusable PRI* macros.])
31 PRI_MACROS_BROKEN=1
32 else
33 PRI_MACROS_BROKEN=0
31 fi 34 fi
35 AC_SUBST([PRI_MACROS_BROKEN])
32]) 36])
diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4
index f342eba3..edc8ecb2 100644
--- a/m4/inttypes_h.m4
+++ b/m4/inttypes_h.m4
@@ -1,26 +1,24 @@
1# inttypes_h.m4 serial 5 (gettext-0.12) 1# inttypes_h.m4 serial 7
2dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Paul Eggert. 7dnl From Paul Eggert.
10 8
11# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists, 9# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
12# doesn't clash with <sys/types.h>, and declares uintmax_t. 10# doesn't clash with <sys/types.h>, and declares uintmax_t.
13 11
14AC_DEFUN([jm_AC_HEADER_INTTYPES_H], 12AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
15[ 13[
16 AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, 14 AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h,
17 [AC_TRY_COMPILE( 15 [AC_TRY_COMPILE(
18 [#include <sys/types.h> 16 [#include <sys/types.h>
19#include <inttypes.h>], 17#include <inttypes.h>],
20 [uintmax_t i = (uintmax_t) -1;], 18 [uintmax_t i = (uintmax_t) -1; return !i;],
21 jm_ac_cv_header_inttypes_h=yes, 19 gl_cv_header_inttypes_h=yes,
22 jm_ac_cv_header_inttypes_h=no)]) 20 gl_cv_header_inttypes_h=no)])
23 if test $jm_ac_cv_header_inttypes_h = yes; then 21 if test $gl_cv_header_inttypes_h = yes; then
24 AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, 22 AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
25 [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, 23 [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
26 and declares uintmax_t. ]) 24 and declares uintmax_t. ])
diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4
index ffd4008b..19aa77e4 100644
--- a/m4/lcmessage.m4
+++ b/m4/lcmessage.m4
@@ -1,10 +1,8 @@
1# lcmessage.m4 serial 3 (gettext-0.11.3) 1# lcmessage.m4 serial 4 (gettext-0.14.2)
2dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. 2dnl Copyright (C) 1995-2002, 2004-2005 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8dnl 6dnl
9dnl This file can can be used in projects which are not available under 7dnl This file can can be used in projects which are not available under
10dnl the GNU General Public License or the GNU Library General Public 8dnl the GNU General Public License or the GNU Library General Public
@@ -20,12 +18,12 @@ dnl Ulrich Drepper <drepper@cygnus.com>, 1995.
20 18
21# Check whether LC_MESSAGES is available in <locale.h>. 19# Check whether LC_MESSAGES is available in <locale.h>.
22 20
23AC_DEFUN([AM_LC_MESSAGES], 21AC_DEFUN([gt_LC_MESSAGES],
24[ 22[
25 AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, 23 AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES,
26 [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], 24 [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
27 am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) 25 gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)])
28 if test $am_cv_val_LC_MESSAGES = yes; then 26 if test $gt_cv_val_LC_MESSAGES = yes; then
29 AC_DEFINE(HAVE_LC_MESSAGES, 1, 27 AC_DEFINE(HAVE_LC_MESSAGES, 1,
30 [Define if your <locale.h> file defines LC_MESSAGES.]) 28 [Define if your <locale.h> file defines LC_MESSAGES.])
31 fi 29 fi
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
index 38aeaec1..96c4e2c3 100644
--- a/m4/lib-ld.m4
+++ b/m4/lib-ld.m4
@@ -1,10 +1,8 @@
1# lib-ld.m4 serial 3 (gettext-0.13) 1# lib-ld.m4 serial 3 (gettext-0.13)
2dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl Subroutines of libtool.m4, 7dnl Subroutines of libtool.m4,
10dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision 8dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index eeb200d2..f95b7ba8 100644
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -1,13 +1,13 @@
1# lib-link.m4 serial 4 (gettext-0.12) 1# lib-link.m4 serial 9 (gettext-0.16)
2dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 2001-2006 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10 8
9AC_PREREQ(2.50)
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
@@ -95,6 +95,8 @@ dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
95dnl hardcode_direct, hardcode_minus_L. 95dnl hardcode_direct, hardcode_minus_L.
96AC_DEFUN([AC_LIB_RPATH], 96AC_DEFUN([AC_LIB_RPATH],
97[ 97[
98 dnl Tell automake >= 1.10 to complain if config.rpath is missing.
99 m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
98 AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS 100 AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
99 AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld 101 AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
100 AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host 102 AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
@@ -124,6 +126,7 @@ dnl the libraries corresponding to explicit and implicit dependencies.
124dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. 126dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
125AC_DEFUN([AC_LIB_LINKFLAGS_BODY], 127AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
126[ 128[
129 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
127 define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], 130 define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
128 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) 131 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
129 dnl By default, look in $includedir and $libdir. 132 dnl By default, look in $includedir and $libdir.
@@ -146,7 +149,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
146 ]) 149 ])
147 else 150 else
148 additional_includedir="$withval/include" 151 additional_includedir="$withval/include"
149 additional_libdir="$withval/lib" 152 additional_libdir="$withval/$acl_libdirstem"
150 fi 153 fi
151 fi 154 fi
152]) 155])
@@ -195,9 +198,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
195 found_so= 198 found_so=
196 found_a= 199 found_a=
197 if test $use_additional = yes; then 200 if test $use_additional = yes; then
198 if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then 201 if test -n "$shlibext" \
202 && { test -f "$additional_libdir/lib$name.$shlibext" \
203 || { test "$shlibext" = dll \
204 && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
199 found_dir="$additional_libdir" 205 found_dir="$additional_libdir"
200 found_so="$additional_libdir/lib$name.$shlibext" 206 if test -f "$additional_libdir/lib$name.$shlibext"; then
207 found_so="$additional_libdir/lib$name.$shlibext"
208 else
209 found_so="$additional_libdir/lib$name.dll.a"
210 fi
201 if test -f "$additional_libdir/lib$name.la"; then 211 if test -f "$additional_libdir/lib$name.la"; then
202 found_la="$additional_libdir/lib$name.la" 212 found_la="$additional_libdir/lib$name.la"
203 fi 213 fi
@@ -217,9 +227,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
217 case "$x" in 227 case "$x" in
218 -L*) 228 -L*)
219 dir=`echo "X$x" | sed -e 's/^X-L//'` 229 dir=`echo "X$x" | sed -e 's/^X-L//'`
220 if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then 230 if test -n "$shlibext" \
231 && { test -f "$dir/lib$name.$shlibext" \
232 || { test "$shlibext" = dll \
233 && test -f "$dir/lib$name.dll.a"; }; }; then
221 found_dir="$dir" 234 found_dir="$dir"
222 found_so="$dir/lib$name.$shlibext" 235 if test -f "$dir/lib$name.$shlibext"; then
236 found_so="$dir/lib$name.$shlibext"
237 else
238 found_so="$dir/lib$name.dll.a"
239 fi
223 if test -f "$dir/lib$name.la"; then 240 if test -f "$dir/lib$name.la"; then
224 found_la="$dir/lib$name.la" 241 found_la="$dir/lib$name.la"
225 fi 242 fi
@@ -246,7 +263,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
246 dnl Linking with a shared library. We attempt to hardcode its 263 dnl Linking with a shared library. We attempt to hardcode its
247 dnl directory into the executable's runpath, unless it's the 264 dnl directory into the executable's runpath, unless it's the
248 dnl standard /usr/lib. 265 dnl standard /usr/lib.
249 if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then 266 if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
250 dnl No hardcoding is needed. 267 dnl No hardcoding is needed.
251 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" 268 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
252 else 269 else
@@ -332,8 +349,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
332 dnl Assume the include files are nearby. 349 dnl Assume the include files are nearby.
333 additional_includedir= 350 additional_includedir=
334 case "$found_dir" in 351 case "$found_dir" in
335 */lib | */lib/) 352 */$acl_libdirstem | */$acl_libdirstem/)
336 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` 353 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
337 additional_includedir="$basedir/include" 354 additional_includedir="$basedir/include"
338 ;; 355 ;;
339 esac 356 esac
@@ -350,7 +367,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
350 if test "X$additional_includedir" = "X/usr/local/include"; then 367 if test "X$additional_includedir" = "X/usr/local/include"; then
351 if test -n "$GCC"; then 368 if test -n "$GCC"; then
352 case $host_os in 369 case $host_os in
353 linux*) haveit=yes;; 370 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
354 esac 371 esac
355 fi 372 fi
356 fi 373 fi
@@ -394,12 +411,12 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
394 dnl 3. if it's already present in $LDFLAGS or the already 411 dnl 3. if it's already present in $LDFLAGS or the already
395 dnl constructed $LIBNAME, 412 dnl constructed $LIBNAME,
396 dnl 4. if it doesn't exist as a directory. 413 dnl 4. if it doesn't exist as a directory.
397 if test "X$additional_libdir" != "X/usr/lib"; then 414 if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
398 haveit= 415 haveit=
399 if test "X$additional_libdir" = "X/usr/local/lib"; then 416 if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
400 if test -n "$GCC"; then 417 if test -n "$GCC"; then
401 case $host_os in 418 case $host_os in
402 linux*) haveit=yes;; 419 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
403 esac 420 esac
404 fi 421 fi
405 fi 422 fi
@@ -549,3 +566,79 @@ AC_DEFUN([AC_LIB_APPENDTOVAR],
549 fi 566 fi
550 done 567 done
551]) 568])
569
570dnl For those cases where a variable contains several -L and -l options
571dnl referring to unknown libraries and directories, this macro determines the
572dnl necessary additional linker options for the runtime path.
573dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
574dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
575dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
576dnl otherwise linking without libtool is assumed.
577AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
578[
579 AC_REQUIRE([AC_LIB_RPATH])
580 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
581 $1=
582 if test "$enable_rpath" != no; then
583 if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
584 dnl Use an explicit option to hardcode directories into the resulting
585 dnl binary.
586 rpathdirs=
587 next=
588 for opt in $2; do
589 if test -n "$next"; then
590 dir="$next"
591 dnl No need to hardcode the standard /usr/lib.
592 if test "X$dir" != "X/usr/$acl_libdirstem"; then
593 rpathdirs="$rpathdirs $dir"
594 fi
595 next=
596 else
597 case $opt in
598 -L) next=yes ;;
599 -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
600 dnl No need to hardcode the standard /usr/lib.
601 if test "X$dir" != "X/usr/$acl_libdirstem"; then
602 rpathdirs="$rpathdirs $dir"
603 fi
604 next= ;;
605 *) next= ;;
606 esac
607 fi
608 done
609 if test "X$rpathdirs" != "X"; then
610 if test -n ""$3""; then
611 dnl libtool is used for linking. Use -R options.
612 for dir in $rpathdirs; do
613 $1="${$1}${$1:+ }-R$dir"
614 done
615 else
616 dnl The linker is used for linking directly.
617 if test -n "$hardcode_libdir_separator"; then
618 dnl Weird platform: only the last -rpath option counts, the user
619 dnl must pass all path elements in one option.
620 alldirs=
621 for dir in $rpathdirs; do
622 alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$dir"
623 done
624 acl_save_libdir="$libdir"
625 libdir="$alldirs"
626 eval flag=\"$hardcode_libdir_flag_spec\"
627 libdir="$acl_save_libdir"
628 $1="$flag"
629 else
630 dnl The -rpath options are cumulative.
631 for dir in $rpathdirs; do
632 acl_save_libdir="$libdir"
633 libdir="$dir"
634 eval flag=\"$hardcode_libdir_flag_spec\"
635 libdir="$acl_save_libdir"
636 $1="${$1}${$1:+ }$flag"
637 done
638 fi
639 fi
640 fi
641 fi
642 fi
643 AC_SUBST([$1])
644])
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index 8aff5a9d..a8684e17 100644
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -1,10 +1,8 @@
1# lib-prefix.m4 serial 3 (gettext-0.13) 1# lib-prefix.m4 serial 5 (gettext-0.15)
2dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10 8
@@ -26,6 +24,7 @@ AC_DEFUN([AC_LIB_PREFIX],
26 AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) 24 AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
27 AC_REQUIRE([AC_PROG_CC]) 25 AC_REQUIRE([AC_PROG_CC])
28 AC_REQUIRE([AC_CANONICAL_HOST]) 26 AC_REQUIRE([AC_CANONICAL_HOST])
27 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
29 AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) 28 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
30 dnl By default, look in $includedir and $libdir. 29 dnl By default, look in $includedir and $libdir.
31 use_additional=yes 30 use_additional=yes
@@ -47,7 +46,7 @@ AC_DEFUN([AC_LIB_PREFIX],
47 ]) 46 ])
48 else 47 else
49 additional_includedir="$withval/include" 48 additional_includedir="$withval/include"
50 additional_libdir="$withval/lib" 49 additional_libdir="$withval/$acl_libdirstem"
51 fi 50 fi
52 fi 51 fi
53]) 52])
@@ -71,7 +70,7 @@ AC_DEFUN([AC_LIB_PREFIX],
71 if test "X$additional_includedir" = "X/usr/local/include"; then 70 if test "X$additional_includedir" = "X/usr/local/include"; then
72 if test -n "$GCC"; then 71 if test -n "$GCC"; then
73 case $host_os in 72 case $host_os in
74 linux*) haveit=yes;; 73 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
75 esac 74 esac
76 fi 75 fi
77 fi 76 fi
@@ -89,7 +88,7 @@ AC_DEFUN([AC_LIB_PREFIX],
89 dnl 2. if it's already present in $LDFLAGS, 88 dnl 2. if it's already present in $LDFLAGS,
90 dnl 3. if it's /usr/local/lib and we are using GCC on Linux, 89 dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
91 dnl 4. if it doesn't exist as a directory. 90 dnl 4. if it doesn't exist as a directory.
92 if test "X$additional_libdir" != "X/usr/lib"; then 91 if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
93 haveit= 92 haveit=
94 for x in $LDFLAGS; do 93 for x in $LDFLAGS; do
95 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) 94 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
@@ -99,7 +98,7 @@ AC_DEFUN([AC_LIB_PREFIX],
99 fi 98 fi
100 done 99 done
101 if test -z "$haveit"; then 100 if test -z "$haveit"; then
102 if test "X$additional_libdir" = "X/usr/local/lib"; then 101 if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
103 if test -n "$GCC"; then 102 if test -n "$GCC"; then
104 case $host_os in 103 case $host_os in
105 linux*) haveit=yes;; 104 linux*) haveit=yes;;
@@ -153,3 +152,34 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
153 exec_prefix="$acl_save_exec_prefix" 152 exec_prefix="$acl_save_exec_prefix"
154 prefix="$acl_save_prefix" 153 prefix="$acl_save_prefix"
155]) 154])
155
156dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
157dnl the basename of the libdir, either "lib" or "lib64".
158AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
159[
160 dnl There is no formal standard regarding lib and lib64. The current
161 dnl practice is that on a system supporting 32-bit and 64-bit instruction
162 dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
163 dnl libraries go under $prefix/lib. We determine the compiler's default
164 dnl mode by looking at the compiler's library search path. If at least
165 dnl of its elements ends in /lib64 or points to a directory whose absolute
166 dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
167 dnl default, namely "lib".
168 acl_libdirstem=lib
169 searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
170 if test -n "$searchpath"; then
171 acl_save_IFS="${IFS= }"; IFS=":"
172 for searchdir in $searchpath; do
173 if test -d "$searchdir"; then
174 case "$searchdir" in
175 */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
176 *) searchdir=`cd "$searchdir" && pwd`
177 case "$searchdir" in
178 */lib64 ) acl_libdirstem=lib64 ;;
179 esac ;;
180 esac
181 fi
182 done
183 IFS="$acl_save_IFS"
184 fi
185])
diff --git a/m4/longdouble.m4 b/m4/longdouble.m4
index 1333d2f5..25590f47 100644
--- a/m4/longdouble.m4
+++ b/m4/longdouble.m4
@@ -1,15 +1,16 @@
1# longdouble.m4 serial 1 (gettext-0.12) 1# longdouble.m4 serial 2 (gettext-0.15)
2dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10dnl Test whether the compiler supports the 'long double' type. 8dnl Test whether the compiler supports the 'long double' type.
11dnl Prerequisite: AC_PROG_CC 9dnl Prerequisite: AC_PROG_CC
12 10
11dnl This file is only needed in autoconf <= 2.59. Newer versions of autoconf
12dnl have a macro AC_TYPE_LONG_DOUBLE with identical semantics.
13
13AC_DEFUN([gt_TYPE_LONGDOUBLE], 14AC_DEFUN([gt_TYPE_LONGDOUBLE],
14[ 15[
15 AC_CACHE_CHECK([for long double], gt_cv_c_long_double, 16 AC_CACHE_CHECK([for long double], gt_cv_c_long_double,
diff --git a/m4/longlong.m4 b/m4/longlong.m4
index d7d7350b..3716c09f 100644
--- a/m4/longlong.m4
+++ b/m4/longlong.m4
@@ -1,23 +1,46 @@
1# longlong.m4 serial 4 1# longlong.m4 serial 8
2dnl Copyright (C) 1999-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 1999-2006 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Paul Eggert. 7dnl From Paul Eggert.
10 8
11# Define HAVE_LONG_LONG if 'long long' 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
11# assume 2.61 everywhere.
12 12
13AC_DEFUN([jm_AC_TYPE_LONG_LONG], 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
15# defined. In this case you can treat 'long long int' like 'long int'.
16
17AC_DEFUN([AC_TYPE_LONG_LONG_INT],
18[
19 AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int],
20 [AC_LINK_IFELSE(
21 [AC_LANG_PROGRAM(
22 [[long long int ll = 9223372036854775807ll;
23 long long int nll = -9223372036854775807LL;
24 typedef int a[((-9223372036854775807LL < 0
25 && 0 < 9223372036854775807ll)
26 ? 1 : -1)];
27 int i = 63;]],
28 [[long long int llmax = 9223372036854775807ll;
29 return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
30 | (llmax / ll) | (llmax % ll));]])],
31 [ac_cv_type_long_long_int=yes],
32 [ac_cv_type_long_long_int=no])])
33 if test $ac_cv_type_long_long_int = yes; then
34 AC_DEFINE([HAVE_LONG_LONG_INT], 1,
35 [Define to 1 if the system has the type `long long int'.])
36 fi
37])
38
39# This macro is obsolescent and should go away soon.
40AC_DEFUN([gl_AC_TYPE_LONG_LONG],
14[ 41[
15 AC_CACHE_CHECK([for long long], ac_cv_type_long_long, 42 AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
16 [AC_TRY_LINK([long long ll = 1LL; int i = 63;], 43 ac_cv_type_long_long=$ac_cv_type_long_long_int
17 [long long llmax = (long long) -1;
18 return ll << i | ll >> i | llmax / ll | llmax % ll;],
19 ac_cv_type_long_long=yes,
20 ac_cv_type_long_long=no)])
21 if test $ac_cv_type_long_long = yes; then 44 if test $ac_cv_type_long_long = yes; then
22 AC_DEFINE(HAVE_LONG_LONG, 1, 45 AC_DEFINE(HAVE_LONG_LONG, 1,
23 [Define if you have the 'long long' type.]) 46 [Define if you have the 'long long' type.])
diff --git a/m4/nls.m4 b/m4/nls.m4
index 36bc4931..7967cc2f 100644
--- a/m4/nls.m4
+++ b/m4/nls.m4
@@ -1,10 +1,8 @@
1# nls.m4 serial 1 (gettext-0.12) 1# nls.m4 serial 3 (gettext-0.15)
2dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8dnl 6dnl
9dnl This file can can be used in projects which are not available under 7dnl This file can can be used in projects which are not available under
10dnl the GNU General Public License or the GNU Library General Public 8dnl the GNU General Public License or the GNU Library General Public
@@ -19,6 +17,8 @@ dnl Authors:
19dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. 17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
20dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. 18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
21 19
20AC_PREREQ(2.50)
21
22AC_DEFUN([AM_NLS], 22AC_DEFUN([AM_NLS],
23[ 23[
24 AC_MSG_CHECKING([whether NLS is requested]) 24 AC_MSG_CHECKING([whether NLS is requested])
@@ -29,21 +29,3 @@ AC_DEFUN([AM_NLS],
29 AC_MSG_RESULT($USE_NLS) 29 AC_MSG_RESULT($USE_NLS)
30 AC_SUBST(USE_NLS) 30 AC_SUBST(USE_NLS)
31]) 31])
32
33AC_DEFUN([AM_MKINSTALLDIRS],
34[
35 dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
36 dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
37 dnl Try to locate it.
38 MKINSTALLDIRS=
39 if test -n "$ac_aux_dir"; then
40 case "$ac_aux_dir" in
41 /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
42 *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
43 esac
44 fi
45 if test -z "$MKINSTALLDIRS"; then
46 MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
47 fi
48 AC_SUBST(MKINSTALLDIRS)
49])
diff --git a/m4/po.m4 b/m4/po.m4
index b8190a50..00133ef3 100644
--- a/m4/po.m4
+++ b/m4/po.m4
@@ -1,10 +1,8 @@
1# po.m4 serial 2 (gettext-0.13) 1# po.m4 serial 13 (gettext-0.15)
2dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8dnl 6dnl
9dnl This file can can be used in projects which are not available under 7dnl This file can can be used in projects which are not available under
10dnl the GNU General Public License or the GNU Library General Public 8dnl the GNU General Public License or the GNU Library General Public
@@ -19,12 +17,14 @@ dnl Authors:
19dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. 17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
20dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. 18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
21 19
20AC_PREREQ(2.50)
21
22dnl Checks for all prerequisites of the po subdirectory. 22dnl Checks for all prerequisites of the po subdirectory.
23AC_DEFUN([AM_PO_SUBDIRS], 23AC_DEFUN([AM_PO_SUBDIRS],
24[ 24[
25 AC_REQUIRE([AC_PROG_MAKE_SET])dnl 25 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
26 AC_REQUIRE([AC_PROG_INSTALL])dnl 26 AC_REQUIRE([AC_PROG_INSTALL])dnl
27 AC_REQUIRE([AM_MKINSTALLDIRS])dnl 27 AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
28 AC_REQUIRE([AM_NLS])dnl 28 AC_REQUIRE([AM_NLS])dnl
29 29
30 dnl Perform the following tests also if --disable-nls has been given, 30 dnl Perform the following tests also if --disable-nls has been given,
@@ -34,59 +34,57 @@ AC_DEFUN([AM_PO_SUBDIRS],
34 dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. 34 dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
35 dnl The second test excludes FreeBSD msgfmt. 35 dnl The second test excludes FreeBSD msgfmt.
36 AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, 36 AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
37 [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && 37 [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
38 (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], 38 (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
39 :) 39 :)
40 AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) 40 AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
41 41
42 dnl Test whether it is GNU msgfmt >= 0.15.
43changequote(,)dnl
44 case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
45 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
46 *) MSGFMT_015=$MSGFMT ;;
47 esac
48changequote([,])dnl
49 AC_SUBST([MSGFMT_015])
50changequote(,)dnl
51 case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
52 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
53 *) GMSGFMT_015=$GMSGFMT ;;
54 esac
55changequote([,])dnl
56 AC_SUBST([GMSGFMT_015])
57
42 dnl Search for GNU xgettext 0.12 or newer in the PATH. 58 dnl Search for GNU xgettext 0.12 or newer in the PATH.
43 dnl The first test excludes Solaris xgettext and early GNU xgettext versions. 59 dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
44 dnl The second test excludes FreeBSD xgettext. 60 dnl The second test excludes FreeBSD xgettext.
45 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, 61 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
46 [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && 62 [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
47 (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], 63 (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
48 :) 64 :)
49 dnl Remove leftover from FreeBSD xgettext call. 65 dnl Remove leftover from FreeBSD xgettext call.
50 rm -f messages.po 66 rm -f messages.po
51 67
68 dnl Test whether it is GNU xgettext >= 0.15.
69changequote(,)dnl
70 case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
71 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
72 *) XGETTEXT_015=$XGETTEXT ;;
73 esac
74changequote([,])dnl
75 AC_SUBST([XGETTEXT_015])
76
52 dnl Search for GNU msgmerge 0.11 or newer in the PATH. 77 dnl Search for GNU msgmerge 0.11 or newer in the PATH.
53 AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, 78 AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
54 [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :) 79 [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
55 80
56 dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. 81 dnl Installation directories.
57 dnl Test whether we really found GNU msgfmt. 82 dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
58 if test "$GMSGFMT" != ":"; then 83 dnl have to define it here, so that it can be used in po/Makefile.
59 dnl If it is no GNU msgfmt we define it as : so that the 84 test -n "$localedir" || localedir='${datadir}/locale'
60 dnl Makefiles still can work. 85 AC_SUBST([localedir])
61 if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
62 (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
63 : ;
64 else
65 GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
66 AC_MSG_RESULT(
67 [found $GMSGFMT program is not GNU msgfmt; ignore it])
68 GMSGFMT=":"
69 fi
70 fi
71
72 dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
73 dnl Test whether we really found GNU xgettext.
74 if test "$XGETTEXT" != ":"; then
75 dnl If it is no GNU xgettext we define it as : so that the
76 dnl Makefiles still can work.
77 if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
78 (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
79 : ;
80 else
81 AC_MSG_RESULT(
82 [found xgettext program is not GNU xgettext; ignore it])
83 XGETTEXT=":"
84 fi
85 dnl Remove leftover from FreeBSD xgettext call.
86 rm -f messages.po
87 fi
88 86
89 AC_OUTPUT_COMMANDS([ 87 AC_CONFIG_COMMANDS([po-directories], [[
90 for ac_file in $CONFIG_FILES; do 88 for ac_file in $CONFIG_FILES; do
91 # Support "outfile[:infile[:infile...]]" 89 # Support "outfile[:infile[:infile...]]"
92 case "$ac_file" in 90 case "$ac_file" in
@@ -106,6 +104,9 @@ AC_DEFUN([AM_PO_SUBDIRS],
106 /*) top_srcdir="$ac_given_srcdir" ;; 104 /*) top_srcdir="$ac_given_srcdir" ;;
107 *) top_srcdir="$ac_dots$ac_given_srcdir" ;; 105 *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
108 esac 106 esac
107 # Treat a directory as a PO directory if and only if it has a
108 # POTFILES.in file. This allows packages to have multiple PO
109 # directories under different names or in different locations.
109 if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then 110 if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
110 rm -f "$ac_dir/POTFILES" 111 rm -f "$ac_dir/POTFILES"
111 test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" 112 test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
@@ -119,12 +120,13 @@ AC_DEFUN([AM_PO_SUBDIRS],
119 if test -n "$OBSOLETE_ALL_LINGUAS"; then 120 if test -n "$OBSOLETE_ALL_LINGUAS"; then
120 test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" 121 test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
121 fi 122 fi
122 ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` 123 ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
123 # Hide the ALL_LINGUAS assigment from automake. 124 # Hide the ALL_LINGUAS assigment from automake < 1.5.
124 eval 'ALL_LINGUAS''=$ALL_LINGUAS_' 125 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
125 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" 126 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
126 else 127 else
127 # The set of available languages was given in configure.in. 128 # The set of available languages was given in configure.in.
129 # Hide the ALL_LINGUAS assigment from automake < 1.5.
128 eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' 130 eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
129 fi 131 fi
130 # Compute POFILES 132 # Compute POFILES
@@ -194,10 +196,10 @@ AC_DEFUN([AM_PO_SUBDIRS],
194 fi 196 fi
195 ;; 197 ;;
196 esac 198 esac
197 done], 199 done]],
198 [# Capture the value of obsolete ALL_LINGUAS because we need it to compute 200 [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
199 # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it 201 # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
200 # from automake. 202 # from automake < 1.5.
201 eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' 203 eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
202 # Capture the value of LINGUAS because we need it to compute CATALOGS. 204 # Capture the value of LINGUAS because we need it to compute CATALOGS.
203 LINGUAS="${LINGUAS-%UNSET%}" 205 LINGUAS="${LINGUAS-%UNSET%}"
@@ -283,7 +285,7 @@ x
283changequote([,])dnl 285changequote([,])dnl
284 286
285 # Set POTFILES to the value of the Makefile variable POTFILES. 287 # Set POTFILES to the value of the Makefile variable POTFILES.
286 sed_x_POTFILES="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`" 288 sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
287 POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"` 289 POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
288 # Compute POTFILES_DEPS as 290 # Compute POTFILES_DEPS as
289 # $(foreach file, $(POTFILES), $(top_srcdir)/$(file)) 291 # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
@@ -298,14 +300,14 @@ changequote([,])dnl
298 fi 300 fi
299 if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then 301 if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
300 # The LINGUAS file contains the set of available languages. 302 # The LINGUAS file contains the set of available languages.
301 ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` 303 ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
302 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" 304 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
303 else 305 else
304 # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS. 306 # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
305 sed_x_LINGUAS="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`" 307 sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
306 ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` 308 ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
307 fi 309 fi
308 # Hide the ALL_LINGUAS assigment from automake. 310 # Hide the ALL_LINGUAS assigment from automake < 1.5.
309 eval 'ALL_LINGUAS''=$ALL_LINGUAS_' 311 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
310 # Compute POFILES 312 # Compute POFILES
311 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) 313 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
@@ -323,6 +325,8 @@ changequote([,])dnl
323 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm) 325 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
324 # Compute MSGFILES 326 # Compute MSGFILES
325 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg) 327 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
328 # Compute RESOURCESDLLFILES
329 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
326 case "$ac_given_srcdir" in 330 case "$ac_given_srcdir" in
327 .) srcdirpre= ;; 331 .) srcdirpre= ;;
328 *) srcdirpre='$(srcdir)/' ;; 332 *) srcdirpre='$(srcdir)/' ;;
@@ -335,6 +339,7 @@ changequote([,])dnl
335 CLASSFILES= 339 CLASSFILES=
336 QMFILES= 340 QMFILES=
337 MSGFILES= 341 MSGFILES=
342 RESOURCESDLLFILES=
338 for lang in $ALL_LINGUAS; do 343 for lang in $ALL_LINGUAS; do
339 POFILES="$POFILES $srcdirpre$lang.po" 344 POFILES="$POFILES $srcdirpre$lang.po"
340 UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" 345 UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
@@ -345,6 +350,8 @@ changequote([,])dnl
345 QMFILES="$QMFILES $srcdirpre$lang.qm" 350 QMFILES="$QMFILES $srcdirpre$lang.qm"
346 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` 351 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
347 MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg" 352 MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
353 frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
354 RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
348 done 355 done
349 # CATALOGS depends on both $ac_dir and the user's LINGUAS 356 # CATALOGS depends on both $ac_dir and the user's LINGUAS
350 # environment variable. 357 # environment variable.
@@ -376,6 +383,7 @@ changequote([,])dnl
376 JAVACATALOGS= 383 JAVACATALOGS=
377 QTCATALOGS= 384 QTCATALOGS=
378 TCLCATALOGS= 385 TCLCATALOGS=
386 CSHARPCATALOGS=
379 if test -n "$INST_LINGUAS"; then 387 if test -n "$INST_LINGUAS"; then
380 for lang in $INST_LINGUAS; do 388 for lang in $INST_LINGUAS; do
381 CATALOGS="$CATALOGS $lang.gmo" 389 CATALOGS="$CATALOGS $lang.gmo"
@@ -383,10 +391,12 @@ changequote([,])dnl
383 QTCATALOGS="$QTCATALOGS $lang.qm" 391 QTCATALOGS="$QTCATALOGS $lang.qm"
384 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` 392 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
385 TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg" 393 TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
394 frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
395 CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
386 done 396 done
387 fi 397 fi
388 398
389 sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp" 399 sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
390 if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then 400 if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
391 # Add dependencies that cannot be formulated as a simple suffix rule. 401 # Add dependencies that cannot be formulated as a simple suffix rule.
392 for lang in $ALL_LINGUAS; do 402 for lang in $ALL_LINGUAS; do
@@ -398,6 +408,17 @@ $frobbedlang.msg: $lang.po
398EOF 408EOF
399 done 409 done
400 fi 410 fi
411 if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
412 # Add dependencies that cannot be formulated as a simple suffix rule.
413 for lang in $ALL_LINGUAS; do
414 frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
415 cat >> "$ac_file.tmp" <<EOF
416$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
417 @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
418 \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
419EOF
420 done
421 fi
401 if test -n "$POMAKEFILEDEPS"; then 422 if test -n "$POMAKEFILEDEPS"; then
402 cat >> "$ac_file.tmp" <<EOF 423 cat >> "$ac_file.tmp" <<EOF
403Makefile: $POMAKEFILEDEPS 424Makefile: $POMAKEFILEDEPS
diff --git a/m4/printf-posix.m4 b/m4/printf-posix.m4
index cd6e40b5..af10170a 100644
--- a/m4/printf-posix.m4
+++ b/m4/printf-posix.m4
@@ -1,10 +1,8 @@
1# printf-posix.m4 serial 1 (gettext-0.13) 1# printf-posix.m4 serial 2 (gettext-0.13.1)
2dnl Copyright (C) 2003 Free Software Foundation, Inc. 2dnl Copyright (C) 2003 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10dnl Test whether the printf() function supports POSIX/XSI format strings with 8dnl Test whether the printf() function supports POSIX/XSI format strings with
@@ -30,7 +28,7 @@ int main ()
30}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no, 28}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no,
31 [ 29 [
32 AC_EGREP_CPP(notposix, [ 30 AC_EGREP_CPP(notposix, [
33#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ 31#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
34 notposix 32 notposix
35#endif 33#endif
36 ], gt_cv_func_printf_posix="guessing no", 34 ], gt_cv_func_printf_posix="guessing no",
diff --git a/m4/progtest.m4 b/m4/progtest.m4
index 8fe527ce..a56365cd 100644
--- a/m4/progtest.m4
+++ b/m4/progtest.m4
@@ -1,10 +1,8 @@
1# progtest.m4 serial 3 (gettext-0.12) 1# progtest.m4 serial 4 (gettext-0.14.2)
2dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8dnl 6dnl
9dnl This file can can be used in projects which are not available under 7dnl This file can can be used in projects which are not available under
10dnl the GNU General Public License or the GNU Library General Public 8dnl the GNU General Public License or the GNU Library General Public
@@ -18,6 +16,8 @@ dnl They are *not* in the public domain.
18dnl Authors: 16dnl Authors:
19dnl Ulrich Drepper <drepper@cygnus.com>, 1996. 17dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
20 18
19AC_PREREQ(2.50)
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
23dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, 23dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
@@ -67,6 +67,7 @@ AC_CACHE_VAL(ac_cv_path_$1,
67 test -z "$ac_dir" && ac_dir=. 67 test -z "$ac_dir" && ac_dir=.
68 for ac_exec_ext in '' $ac_executable_extensions; do 68 for ac_exec_ext in '' $ac_executable_extensions; do
69 if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then 69 if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
70 echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
70 if [$3]; then 71 if [$3]; then
71 ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext" 72 ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
72 break 2 73 break 2
diff --git a/m4/size_max.m4 b/m4/size_max.m4
index 5762fc33..bfba811e 100644
--- a/m4/size_max.m4
+++ b/m4/size_max.m4
@@ -1,10 +1,8 @@
1# size_max.m4 serial 2 1# size_max.m4 serial 5
2dnl Copyright (C) 2003 Free Software Foundation, Inc. 2dnl Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10 8
@@ -13,8 +11,9 @@ AC_DEFUN([gl_SIZE_MAX],
13 AC_CHECK_HEADERS(stdint.h) 11 AC_CHECK_HEADERS(stdint.h)
14 dnl First test whether the system already has SIZE_MAX. 12 dnl First test whether the system already has SIZE_MAX.
15 AC_MSG_CHECKING([for SIZE_MAX]) 13 AC_MSG_CHECKING([for SIZE_MAX])
16 result= 14 AC_CACHE_VAL([gl_cv_size_max], [
17 AC_EGREP_CPP([Found it], [ 15 gl_cv_size_max=
16 AC_EGREP_CPP([Found it], [
18#include <limits.h> 17#include <limits.h>
19#if HAVE_STDINT_H 18#if HAVE_STDINT_H
20#include <stdint.h> 19#include <stdint.h>
@@ -22,40 +21,42 @@ AC_DEFUN([gl_SIZE_MAX],
22#ifdef SIZE_MAX 21#ifdef SIZE_MAX
23Found it 22Found it
24#endif 23#endif
25], result=yes) 24], gl_cv_size_max=yes)
26 if test -z "$result"; then 25 if test -z "$gl_cv_size_max"; then
27 dnl Define it ourselves. Here we assume that the type 'size_t' is not wider 26 dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
28 dnl than the type 'unsigned long'. 27 dnl than the type 'unsigned long'. Try hard to find a definition that can
29 dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr', 28 dnl be used in a preprocessor #if, i.e. doesn't contain a cast.
30 dnl which is guaranteed to work from LONG_MIN to LONG_MAX. 29 _AC_COMPUTE_INT([sizeof (size_t) * CHAR_BIT - 1], size_t_bits_minus_1,
31 _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi, 30 [#include <stddef.h>
32 [#include <stddef.h>], result=?) 31#include <limits.h>], size_t_bits_minus_1=)
33 _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo, 32 _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
34 [#include <stddef.h>], result=?) 33 [#include <stddef.h>], fits_in_uint=)
35 _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint, 34 if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
36 [#include <stddef.h>], result=?) 35 if test $fits_in_uint = 1; then
37 if test "$fits_in_uint" = 1; then 36 dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
38 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'.
39 dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'. 38 AC_TRY_COMPILE([#include <stddef.h>
40 AC_TRY_COMPILE([#include <stddef.h> 39 extern size_t foo;
41 extern size_t foo; 40 extern unsigned long foo;
42 extern unsigned long foo; 41 ], [], fits_in_uint=0)
43 ], [], fits_in_uint=0) 42 fi
44 fi 43 dnl We cannot use 'expr' to simplify this expression, because 'expr'
45 if test -z "$result"; then 44 dnl works only with 'long' integers in the host environment, while we
46 if test "$fits_in_uint" = 1; then 45 dnl might be cross-compiling from a 32-bit platform to a 64-bit platform.
47 result="$res_hi$res_lo"U 46 if test $fits_in_uint = 1; then
47 gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)"
48 else
49 gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)"
50 fi
48 else 51 else
49 result="$res_hi$res_lo"UL 52 dnl Shouldn't happen, but who knows...
53 gl_cv_size_max='((size_t)~(size_t)0)'
50 fi 54 fi
51 else
52 dnl Shouldn't happen, but who knows...
53 result='~(size_t)0'
54 fi 55 fi
55 fi 56 ])
56 AC_MSG_RESULT([$result]) 57 AC_MSG_RESULT([$gl_cv_size_max])
57 if test "$result" != yes; then 58 if test "$gl_cv_size_max" != yes; then
58 AC_DEFINE_UNQUOTED([SIZE_MAX], [$result], 59 AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max],
59 [Define as the maximum value of type 'size_t', if the system doesn't define it.]) 60 [Define as the maximum value of type 'size_t', if the system doesn't define it.])
60 fi 61 fi
61]) 62])
diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4
index 32ba7ae7..db9a8ac4 100644
--- a/m4/stdint_h.m4
+++ b/m4/stdint_h.m4
@@ -1,26 +1,24 @@
1# stdint_h.m4 serial 3 (gettext-0.12) 1# stdint_h.m4 serial 6
2dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Paul Eggert. 7dnl From Paul Eggert.
10 8
11# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists, 9# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
12# doesn't clash with <sys/types.h>, and declares uintmax_t. 10# doesn't clash with <sys/types.h>, and declares uintmax_t.
13 11
14AC_DEFUN([jm_AC_HEADER_STDINT_H], 12AC_DEFUN([gl_AC_HEADER_STDINT_H],
15[ 13[
16 AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, 14 AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h,
17 [AC_TRY_COMPILE( 15 [AC_TRY_COMPILE(
18 [#include <sys/types.h> 16 [#include <sys/types.h>
19#include <stdint.h>], 17#include <stdint.h>],
20 [uintmax_t i = (uintmax_t) -1;], 18 [uintmax_t i = (uintmax_t) -1; return !i;],
21 jm_ac_cv_header_stdint_h=yes, 19 gl_cv_header_stdint_h=yes,
22 jm_ac_cv_header_stdint_h=no)]) 20 gl_cv_header_stdint_h=no)])
23 if test $jm_ac_cv_header_stdint_h = yes; then 21 if test $gl_cv_header_stdint_h = yes; then
24 AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, 22 AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
25 [Define if <stdint.h> exists, doesn't clash with <sys/types.h>, 23 [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
26 and declares uintmax_t. ]) 24 and declares uintmax_t. ])
diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4
index b5f28d44..bf83ed74 100644
--- a/m4/uintmax_t.m4
+++ b/m4/uintmax_t.m4
@@ -1,10 +1,8 @@
1# uintmax_t.m4 serial 7 (gettext-0.12) 1# uintmax_t.m4 serial 9
2dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Paul Eggert. 7dnl From Paul Eggert.
10 8
@@ -13,12 +11,12 @@ AC_PREREQ(2.13)
13# Define uintmax_t to 'unsigned long' or 'unsigned long long' 11# Define uintmax_t to 'unsigned long' or 'unsigned long long'
14# 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>.
15 13
16AC_DEFUN([jm_AC_TYPE_UINTMAX_T], 14AC_DEFUN([gl_AC_TYPE_UINTMAX_T],
17[ 15[
18 AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) 16 AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
19 AC_REQUIRE([jm_AC_HEADER_STDINT_H]) 17 AC_REQUIRE([gl_AC_HEADER_STDINT_H])
20 if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then 18 if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
21 AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) 19 AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
22 test $ac_cv_type_unsigned_long_long = yes \ 20 test $ac_cv_type_unsigned_long_long = yes \
23 && ac_type='unsigned long long' \ 21 && ac_type='unsigned long long' \
24 || ac_type='unsigned long' 22 || ac_type='unsigned long'
diff --git a/m4/ulonglong.m4 b/m4/ulonglong.m4
index 1da8b809..9fae98e3 100644
--- a/m4/ulonglong.m4
+++ b/m4/ulonglong.m4
@@ -1,23 +1,46 @@
1# ulonglong.m4 serial 3 1# ulonglong.m4 serial 6
2dnl Copyright (C) 1999-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 1999-2006 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Paul Eggert. 7dnl From Paul Eggert.
10 8
11# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works. 9# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
10# This fixes a bug in Autoconf 2.60, but can be removed once we
11# assume 2.61 everywhere.
12 12
13AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG], 13# Note: If the type 'unsigned long long int' exists but is only 32 bits
14# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
15# will not be defined. In this case you can treat 'unsigned long long int'
16# like 'unsigned long int'.
17
18AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
19[
20 AC_CACHE_CHECK([for unsigned long long int],
21 [ac_cv_type_unsigned_long_long_int],
22 [AC_LINK_IFELSE(
23 [AC_LANG_PROGRAM(
24 [[unsigned long long int ull = 18446744073709551615ULL;
25 typedef int a[(18446744073709551615ULL <= (unsigned long long int) -1
26 ? 1 : -1)];
27 int i = 63;]],
28 [[unsigned long long int ullmax = 18446744073709551615ull;
29 return (ull << 63 | ull >> 63 | ull << i | ull >> i
30 | ullmax / ull | ullmax % ull);]])],
31 [ac_cv_type_unsigned_long_long_int=yes],
32 [ac_cv_type_unsigned_long_long_int=no])])
33 if test $ac_cv_type_unsigned_long_long_int = yes; then
34 AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], 1,
35 [Define to 1 if the system has the type `unsigned long long int'.])
36 fi
37])
38
39# This macro is obsolescent and should go away soon.
40AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG],
14[ 41[
15 AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, 42 AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
16 [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;], 43 ac_cv_type_unsigned_long_long=$ac_cv_type_unsigned_long_long_int
17 [unsigned long long ullmax = (unsigned long long) -1;
18 return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
19 ac_cv_type_unsigned_long_long=yes,
20 ac_cv_type_unsigned_long_long=no)])
21 if test $ac_cv_type_unsigned_long_long = yes; then 44 if test $ac_cv_type_unsigned_long_long = yes; then
22 AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1, 45 AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
23 [Define if you have the 'unsigned long long' type.]) 46 [Define if you have the 'unsigned long long' type.])
diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4
index d8fd1ec5..cde2129a 100644
--- a/m4/wchar_t.m4
+++ b/m4/wchar_t.m4
@@ -1,10 +1,8 @@
1# wchar_t.m4 serial 1 (gettext-0.12) 1# wchar_t.m4 serial 1 (gettext-0.12)
2dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10dnl Test whether <stddef.h> has the 'wchar_t' type. 8dnl Test whether <stddef.h> has the 'wchar_t' type.
diff --git a/m4/wint_t.m4 b/m4/wint_t.m4
index 3d8d2159..b8fff9c8 100644
--- a/m4/wint_t.m4
+++ b/m4/wint_t.m4
@@ -1,10 +1,8 @@
1# wint_t.m4 serial 1 (gettext-0.12) 1# wint_t.m4 serial 1 (gettext-0.12)
2dnl Copyright (C) 2003 Free Software Foundation, Inc. 2dnl Copyright (C) 2003 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10dnl Test whether <wchar.h> has the 'wint_t' type. 8dnl Test whether <wchar.h> has the 'wint_t' type.
diff --git a/m4/xsize.m4 b/m4/xsize.m4
index 9b7cf9b4..85bb721e 100644
--- a/m4/xsize.m4
+++ b/m4/xsize.m4
@@ -1,14 +1,13 @@
1# xsize.m4 serial 2 1# xsize.m4 serial 3
2dnl Copyright (C) 2003 Free Software Foundation, Inc. 2dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9AC_DEFUN([gl_XSIZE], 7AC_DEFUN([gl_XSIZE],
10[ 8[
11 dnl Prerequisites of lib/xsize.h. 9 dnl Prerequisites of lib/xsize.h.
12 AC_REQUIRE([gl_SIZE_MAX]) 10 AC_REQUIRE([gl_SIZE_MAX])
11 AC_REQUIRE([AC_C_INLINE])
13 AC_CHECK_HEADERS(stdint.h) 12 AC_CHECK_HEADERS(stdint.h)
14]) 13])
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-18 19:37:46 +0000