Ubuntu
json-glib package

Merge lp:~ted/ubuntu/oneiric/json-glib/0.13.4 into lp:ubuntu/oneiric/json-glib

  1. Oneiric (11.10)
  2. 0.13.4
  3. Merge into oneiric
Proposed by Ted Gould
Status: Work in progress
Proposed branch: lp:~ted/ubuntu/oneiric/json-glib/0.13.4
Merge into: lp:ubuntu/oneiric/json-glib
Diff against target: 21515 lines (+14339/-3962)
156 files modified
ABOUT-NLS (+1327/-0)
AUTHORS (+0/-1)
ChangeLog (+527/-0)
INSTALL (+0/-365)
Makefile.am (+1/-7)
Makefile.in (+38/-10)
NEWS (+6/-0)
aclocal.m4 (+10/-0)
build/Makefile.in (+31/-2)
build/autotools/Makefile.am (+1/-0)
build/autotools/Makefile.in (+32/-2)
build/autotools/as-linguas.m4 (+24/-0)
build/autotools/gettext.m4 (+383/-0)
build/autotools/iconv.m4 (+199/-0)
build/autotools/intlmacosx.m4 (+51/-0)
build/autotools/lib-ld.m4 (+110/-0)
build/autotools/lib-link.m4 (+774/-0)
build/autotools/lib-prefix.m4 (+224/-0)
build/autotools/nls.m4 (+32/-0)
build/autotools/po.m4 (+449/-0)
build/autotools/progtest.m4 (+92/-0)
build/win32/Makefile.in (+31/-2)
build/win32/config.h.win32 (+5/-2)
build/win32/config.h.win32.in (+3/-0)
build/win32/vs10/Makefile.am (+12/-8)
build/win32/vs10/Makefile.in (+43/-10)
build/win32/vs10/boxed.vcxproj (+172/-0)
build/win32/vs10/boxed.vcxproj.filters (+14/-0)
build/win32/vs10/gvariant-test.vcxproj (+159/-0)
build/win32/vs10/gvariant-test.vcxproj.filters (+14/-0)
build/win32/vs10/install.vcxproj (+12/-4)
build/win32/vs10/json-glib.props (+28/-24)
build/win32/vs10/json-glib.sln (+27/-7)
build/win32/vs10/json-glib.vcxproj (+1/-0)
build/win32/vs10/json-glib.vcxproj.filters (+1/-0)
build/win32/vs10/path-test.vcxproj (+159/-0)
build/win32/vs10/path-test.vcxproj.filters (+14/-0)
build/win32/vs10/serialize-complex.vcxproj (+171/-0)
build/win32/vs10/serialize-complex.vcxproj.filters (+14/-0)
build/win32/vs10/serialize-full.vcxproj (+172/-0)
build/win32/vs10/serialize-full.vcxproj.filters (+14/-0)
build/win32/vs10/serialize-simple.vcxproj (+171/-0)
build/win32/vs10/serialize-simple.vcxproj.filters (+14/-0)
build/win32/vs10/test-serialize-boxed.vcxproj (+0/-172)
build/win32/vs10/test-serialize-boxed.vcxproj.filters (+0/-14)
build/win32/vs10/test-serialize-complex.vcxproj (+0/-171)
build/win32/vs10/test-serialize-complex.vcxproj.filters (+0/-14)
build/win32/vs10/test-serialize-full.vcxproj (+0/-172)
build/win32/vs10/test-serialize-full.vcxproj.filters (+0/-14)
build/win32/vs10/test-serialize-simple.vcxproj (+0/-171)
build/win32/vs10/test-serialize-simple.vcxproj.filters (+0/-14)
build/win32/vs9/Makefile.am (+6/-4)
build/win32/vs9/Makefile.in (+37/-6)
build/win32/vs9/boxed.vcproj (+157/-0)
build/win32/vs9/gvariant-test.vcproj (+147/-0)
build/win32/vs9/json-glib.sln (+44/-16)
build/win32/vs9/json-glib.vcproj (+1/-0)
build/win32/vs9/json-glib.vsprops (+20/-18)
build/win32/vs9/path-test.vcproj (+147/-0)
build/win32/vs9/serialize-complex.vcproj (+156/-0)
build/win32/vs9/serialize-full.vcproj (+157/-0)
build/win32/vs9/serialize-simple.vcproj (+156/-0)
build/win32/vs9/test-serialize-boxed.vcproj (+0/-157)
build/win32/vs9/test-serialize-complex.vcproj (+0/-156)
build/win32/vs9/test-serialize-full.vcproj (+0/-157)
build/win32/vs9/test-serialize-simple.vcproj (+0/-156)
config.h.in (+25/-0)
config.rpath (+672/-0)
configure (+2221/-17)
configure.ac (+16/-5)
debian/changelog (+9/-0)
debian/control (+2/-1)
debian/control.in (+2/-1)
debian/libjson-glib-1.0-0.symbols (+11/-0)
doc/Makefile.in (+31/-2)
doc/reference/Makefile.in (+31/-2)
doc/reference/html/JsonPath.html (+464/-0)
doc/reference/html/JsonReader.html (+8/-8)
doc/reference/html/annotation-glossary.html (+21/-18)
doc/reference/html/ch01.html (+1/-1)
doc/reference/html/ch02.html (+4/-1)
doc/reference/html/ch03.html (+3/-3)
doc/reference/html/ch04.html (+2/-1)
doc/reference/html/index.html (+6/-3)
doc/reference/html/index.sgml (+23/-3)
doc/reference/html/ix01.html (+49/-1)
doc/reference/html/ix02.html (+1/-1)
doc/reference/html/ix03.html (+1/-1)
doc/reference/html/ix04.html (+1/-1)
doc/reference/html/ix05.html (+1/-1)
doc/reference/html/ix06.html (+1/-1)
doc/reference/html/ix07.html (+1/-1)
doc/reference/html/json-glib-JSON-Array.html (+2/-2)
doc/reference/html/json-glib-JSON-GVariant-Integration.html (+3/-3)
doc/reference/html/json-glib-JSON-Node.html (+4/-4)
doc/reference/html/json-glib-JSON-Object.html (+2/-2)
doc/reference/html/json-glib-Serializable-Interface.html (+115/-0)
doc/reference/html/json-glib-Versioning-information.html (+3/-3)
doc/reference/html/json-glib.devhelp (+14/-0)
doc/reference/html/json-glib.devhelp2 (+15/-0)
doc/reference/html/json-streams.html (+3/-0)
doc/reference/json-glib-docs.xml (+2/-1)
doc/reference/json-glib-sections.txt (+24/-0)
doc/reference/json-glib.types (+1/-0)
doc/reference/version.xml (+1/-1)
json-glib/Json-1.0.gir (+291/-2)
json-glib/Makefile.am (+2/-1)
json-glib/Makefile.in (+45/-5)
json-glib/json-array.c (+3/-8)
json-glib/json-builder.c (+1/-0)
json-glib/json-debug.c (+2/-1)
json-glib/json-debug.h (+2/-1)
json-glib/json-enum-types.c (+24/-0)
json-glib/json-enum-types.h (+4/-0)
json-glib/json-glib.h (+1/-0)
json-glib/json-glib.symbols (+10/-0)
json-glib/json-gobject.c (+45/-11)
json-glib/json-gobject.h (+28/-0)
json-glib/json-gvariant.c (+26/-24)
json-glib/json-node.c (+3/-3)
json-glib/json-object.c (+3/-8)
json-glib/json-parser.c (+6/-1)
json-glib/json-path.c (+1029/-0)
json-glib/json-path.h (+97/-0)
json-glib/json-reader.c (+15/-13)
json-glib/json-reader.h (+3/-3)
json-glib/json-serializable.c (+106/-0)
json-glib/json-types-private.h (+1/-1)
json-glib/json-types.h (+4/-4)
json-glib/json-version.h (+3/-3)
json-glib/tests/Makefile.am (+18/-36)
json-glib/tests/Makefile.in (+123/-61)
json-glib/tests/boxed.c (+264/-0)
json-glib/tests/builder-test.c (+54/-14)
json-glib/tests/path-test.c (+143/-0)
json-glib/tests/serialize-complex.c (+293/-0)
json-glib/tests/serialize-full.c (+402/-0)
json-glib/tests/serialize-simple.c (+166/-0)
po/Makefile.in.in (+444/-0)
po/Makevars (+7/-0)
po/POTFILES.in (+6/-0)
po/Rules-quot (+47/-0)
po/boldquot.sed (+10/-0)
po/en@boldquot.header (+25/-0)
po/en@quot.header (+22/-0)
po/insert-header.sin (+23/-0)
po/json-glib-1.0.pot (+126/-0)
po/quot.sed (+6/-0)
po/remove-potcdate.sin (+19/-0)
po/stamp-po (+1/-0)
tests/Makefile.am (+0/-34)
tests/Makefile.in (+0/-658)
tests/test-serialize-boxed.c (+0/-264)
tests/test-serialize-complex.c (+0/-293)
tests/test-serialize-full.c (+0/-402)
tests/test-serialize-simple.c (+0/-166)
To merge this branch: bzr merge lp:~ted/ubuntu/oneiric/json-glib/0.13.4
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
Review via email: mp+65263@code.launchpad.net

Description of the change

Upstream release 0.13.4

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thank you for the work but we are on sync with Debian and it would be better to stay this way, I've pinged one of the Debian maintainer to see if they can take the update so we would just have to sync. Is the new version stopping you in any way for something you need?

Reply
Revision history for this message
Ted Gould (ted) wrote :

On Tue, 2011-06-21 at 13:12 +0000, Sebastien Bacher wrote:
> Thank you for the work but we are on sync with Debian and it would
> be better to stay this way, I've pinged one of the Debian maintainer
> to see if they can take the update so we would just have to sync.
> Is the new version stopping you in any way for something you need?

Yes, anything that uses it doesn't build :-) It's a G_CONST_RETURN in
the header file.

Reply

Unmerged revisions

24. By Ted Gould

releasing version 0.13.4-0ubuntu1~ppa1

23. By Ted Gould

dbbian/libjson-glib-1.0-0.symbols: Update for 0.13.4

22. By Ted Gould

debian/control: Making Ubuntu maintainers

21. By Ted Gould

* New upstream release.
  * Fixes for removal of G_CONST_RETURN

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'ABOUT-NLS'
--- ABOUT-NLS 1970-01-01 00:00:00 +0000
+++ ABOUT-NLS 2011-06-20 20:11:46 +0000
@@ -0,0 +1,1327 @@
11 Notes on the Free Translation Project
2***************************************
3
4Free software is going international! The Free Translation Project is
5a way to get maintainers of free software, translators, and users all
6together, so that free software will gradually become able to speak many
7languages. A few packages already provide translations for their
8messages.
9
10 If you found this `ABOUT-NLS' file inside a distribution, you may
11assume that the distributed package does use GNU `gettext' internally,
12itself available at your nearest GNU archive site. But you do _not_
13need to install GNU `gettext' prior to configuring, installing or using
14this package with messages translated.
15
16 Installers will find here some useful hints. These notes also
17explain how users should proceed for getting the programs to use the
18available translations. They tell how people wanting to contribute and
19work on translations can contact the appropriate team.
20
21 When reporting bugs in the `intl/' directory or bugs which may be
22related to internationalization, you should tell about the version of
23`gettext' which is used. The information can be found in the
24`intl/VERSION' file, in internationalized packages.
25
261.1 Quick configuration advice
27==============================
28
29If you want to exploit the full power of internationalization, you
30should configure it using
31
32 ./configure --with-included-gettext
33
34to force usage of internationalizing routines provided within this
35package, despite the existence of internationalizing capabilities in the
36operating system where this package is being installed. So far, only
37the `gettext' implementation in the GNU C library version 2 provides as
38many features (such as locale alias, message inheritance, automatic
39charset conversion or plural form handling) as the implementation here.
40It is also not possible to offer this additional functionality on top
41of a `catgets' implementation. Future versions of GNU `gettext' will
42very likely convey even more functionality. So it might be a good idea
43to change to GNU `gettext' as soon as possible.
44
45 So you need _not_ provide this option if you are using GNU libc 2 or
46you have installed a recent copy of the GNU gettext package with the
47included `libintl'.
48
491.2 INSTALL Matters
50===================
51
52Some packages are "localizable" when properly installed; the programs
53they contain can be made to speak your own native language. Most such
54packages use GNU `gettext'. Other packages have their own ways to
55internationalization, predating GNU `gettext'.
56
57 By default, this package will be installed to allow translation of
58messages. It will automatically detect whether the system already
59provides the GNU `gettext' functions. If not, the included GNU
60`gettext' library will be used. This library is wholly contained
61within this package, usually in the `intl/' subdirectory, so prior
62installation of the GNU `gettext' package is _not_ required.
63Installers may use special options at configuration time for changing
64the default behaviour. The commands:
65
66 ./configure --with-included-gettext
67 ./configure --disable-nls
68
69will, respectively, bypass any pre-existing `gettext' to use the
70internationalizing routines provided within this package, or else,
71_totally_ disable translation of messages.
72
73 When you already have GNU `gettext' installed on your system and run
74configure without an option for your new package, `configure' will
75probably detect the previously built and installed `libintl.a' file and
76will decide to use this. This might not be desirable. You should use
77the more recent version of the GNU `gettext' library. I.e. if the file
78`intl/VERSION' shows that the library which comes with this package is
79more recent, you should use
80
81 ./configure --with-included-gettext
82
83to prevent auto-detection.
84
85 The configuration process will not test for the `catgets' function
86and therefore it will not be used. The reason is that even an
87emulation of `gettext' on top of `catgets' could not provide all the
88extensions of the GNU `gettext' library.
89
90 Internationalized packages usually have many `po/LL.po' files, where
91LL gives an ISO 639 two-letter code identifying the language. Unless
92translations have been forbidden at `configure' time by using the
93`--disable-nls' switch, all available translations are installed
94together with the package. However, the environment variable `LINGUAS'
95may be set, prior to configuration, to limit the installed set.
96`LINGUAS' should then contain a space separated list of two-letter
97codes, stating which languages are allowed.
98
991.3 Using This Package
100======================
101
102As a user, if your language has been installed for this package, you
103only have to set the `LANG' environment variable to the appropriate
104`LL_CC' combination. If you happen to have the `LC_ALL' or some other
105`LC_xxx' environment variables set, you should unset them before
106setting `LANG', otherwise the setting of `LANG' will not have the
107desired effect. Here `LL' is an ISO 639 two-letter language code, and
108`CC' is an ISO 3166 two-letter country code. For example, let's
109suppose that you speak German and live in Germany. At the shell
110prompt, merely execute `setenv LANG de_DE' (in `csh'),
111`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
112This can be done from your `.login' or `.profile' file, once and for
113all.
114
115 You might think that the country code specification is redundant.
116But in fact, some languages have dialects in different countries. For
117example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The
118country code serves to distinguish the dialects.
119
120 The locale naming convention of `LL_CC', with `LL' denoting the
121language and `CC' denoting the country, is the one use on systems based
122on GNU libc. On other systems, some variations of this scheme are
123used, such as `LL' or `LL_CC.ENCODING'. You can get the list of
124locales supported by your system for your language by running the
125command `locale -a | grep '^LL''.
126
127 Not all programs have translations for all languages. By default, an
128English message is shown in place of a nonexistent translation. If you
129understand other languages, you can set up a priority list of languages.
130This is done through a different environment variable, called
131`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG'
132for the purpose of message handling, but you still need to have `LANG'
133set to the primary language; this is required by other parts of the
134system libraries. For example, some Swedish users who would rather
135read translations in German than English for when Swedish is not
136available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
137
138 Special advice for Norwegian users: The language code for Norwegian
139bokma*l changed from `no' to `nb' recently (in 2003). During the
140transition period, while some message catalogs for this language are
141installed under `nb' and some older ones under `no', it's recommended
142for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
143older translations are used.
144
145 In the `LANGUAGE' environment variable, but not in the `LANG'
146environment variable, `LL_CC' combinations can be abbreviated as `LL'
147to denote the language's main dialect. For example, `de' is equivalent
148to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
149(Portuguese as spoken in Portugal) in this context.
150
1511.4 Translating Teams
152=====================
153
154For the Free Translation Project to be a success, we need interested
155people who like their own language and write it well, and who are also
156able to synergize with other translators speaking the same language.
157Each translation team has its own mailing list. The up-to-date list of
158teams can be found at the Free Translation Project's homepage,
159`http://translationproject.org/', in the "Teams" area.
160
161 If you'd like to volunteer to _work_ at translating messages, you
162should become a member of the translating team for your own language.
163The subscribing address is _not_ the same as the list itself, it has
164`-request' appended. For example, speakers of Swedish can send a
165message to `sv-request@li.org', having this message body:
166
167 subscribe
168
169 Keep in mind that team members are expected to participate
170_actively_ in translations, or at solving translational difficulties,
171rather than merely lurking around. If your team does not exist yet and
172you want to start one, or if you are unsure about what to do or how to
173get started, please write to `coordinator@translationproject.org' to
174reach the coordinator for all translator teams.
175
176 The English team is special. It works at improving and uniformizing
177the terminology in use. Proven linguistic skills are praised more than
178programming skills, here.
179
1801.5 Available Packages
181======================
182
183Languages are not equally supported in all packages. The following
184matrix shows the current state of internationalization, as of May 2010.
185The matrix shows, in regard of each package, for which languages PO
186files have been submitted to translation coordination, with a
187translation percentage of at least 50%.
188
189 Ready PO files af am ar as ast az be be@latin bg bn_IN bs ca crh
190 +---------------------------------------------------+
191 a2ps | [] [] |
192 aegis | |
193 ant-phone | |
194 anubis | |
195 aspell | [] [] |
196 bash | |
197 bfd | |
198 bibshelf | [] |
199 binutils | |
200 bison | |
201 bison-runtime | [] |
202 bluez-pin | [] [] |
203 bombono-dvd | |
204 buzztard | |
205 cflow | |
206 clisp | |
207 coreutils | [] [] |
208 cpio | |
209 cppi | |
210 cpplib | [] |
211 cryptsetup | |
212 dfarc | |
213 dialog | [] [] |
214 dico | |
215 diffutils | [] |
216 dink | |
217 doodle | |
218 e2fsprogs | [] |
219 enscript | [] |
220 exif | |
221 fetchmail | [] |
222 findutils | [] |
223 flex | [] |
224 freedink | |
225 gas | |
226 gawk | [] [] |
227 gcal | [] |
228 gcc | |
229 gettext-examples | [] [] [] [] |
230 gettext-runtime | [] [] [] |
231 gettext-tools | [] [] |
232 gip | [] |
233 gjay | |
234 gliv | [] |
235 glunarclock | [] [] |
236 gnubiff | |
237 gnucash | [] |
238 gnuedu | |
239 gnulib | |
240 gnunet | |
241 gnunet-gtk | |
242 gnutls | |
243 gold | |
244 gpe-aerial | |
245 gpe-beam | |
246 gpe-bluetooth | |
247 gpe-calendar | |
248 gpe-clock | [] |
249 gpe-conf | |
250 gpe-contacts | |
251 gpe-edit | |
252 gpe-filemanager | |
253 gpe-go | |
254 gpe-login | |
255 gpe-ownerinfo | [] |
256 gpe-package | |
257 gpe-sketchbook | |
258 gpe-su | [] |
259 gpe-taskmanager | [] |
260 gpe-timesheet | [] |
261 gpe-today | [] |
262 gpe-todo | |
263 gphoto2 | |
264 gprof | [] |
265 gpsdrive | |
266 gramadoir | |
267 grep | |
268 grub | [] [] |
269 gsasl | |
270 gss | |
271 gst-plugins-bad | [] |
272 gst-plugins-base | [] |
273 gst-plugins-good | [] |
274 gst-plugins-ugly | [] |
275 gstreamer | [] [] [] |
276 gtick | |
277 gtkam | [] |
278 gtkorphan | [] |
279 gtkspell | [] [] [] |
280 gutenprint | |
281 hello | [] |
282 help2man | |
283 hylafax | |
284 idutils | |
285 indent | [] [] |
286 iso_15924 | |
287 iso_3166 | [] [] [] [] [] [] [] [] |
288 iso_3166_2 | |
289 iso_4217 | |
290 iso_639 | [] [] [] [] [] |
291 iso_639_3 | [] |
292 jwhois | |
293 kbd | |
294 keytouch | [] |
295 keytouch-editor | |
296 keytouch-keyboa... | [] |
297 klavaro | [] |
298 latrine | |
299 ld | [] |
300 leafpad | [] [] |
301 libc | [] [] |
302 libexif | () |
303 libextractor | |
304 libgnutls | |
305 libgpewidget | |
306 libgpg-error | |
307 libgphoto2 | |
308 libgphoto2_port | |
309 libgsasl | |
310 libiconv | [] |
311 libidn | |
312 lifelines | |
313 liferea | [] [] |
314 lilypond | |
315 linkdr | [] |
316 lordsawar | |
317 lprng | |
318 lynx | [] |
319 m4 | |
320 mailfromd | |
321 mailutils | |
322 make | |
323 man-db | |
324 man-db-manpages | |
325 minicom | |
326 mkisofs | |
327 myserver | |
328 nano | [] [] |
329 opcodes | |
330 parted | |
331 pies | |
332 popt | |
333 psmisc | |
334 pspp | [] |
335 pwdutils | |
336 radius | [] |
337 recode | [] [] |
338 rosegarden | |
339 rpm | |
340 rush | |
341 sarg | |
342 screem | |
343 scrollkeeper | [] [] [] |
344 sed | [] [] |
345 sharutils | [] [] |
346 shishi | |
347 skencil | |
348 solfege | |
349 solfege-manual | |
350 soundtracker | |
351 sp | |
352 sysstat | |
353 tar | [] |
354 texinfo | |
355 tin | |
356 unicode-han-tra... | |
357 unicode-transla... | |
358 util-linux-ng | [] |
359 vice | |
360 vmm | |
361 vorbis-tools | |
362 wastesedge | |
363 wdiff | |
364 wget | [] [] |
365 wyslij-po | |
366 xchat | [] [] [] [] |
367 xdg-user-dirs | [] [] [] [] [] [] [] [] [] |
368 xkeyboard-config | [] [] [] |
369 +---------------------------------------------------+
370 af am ar as ast az be be@latin bg bn_IN bs ca crh
371 6 0 2 3 19 1 11 3 28 3 1 38 5
372
373 cs da de el en en_GB en_ZA eo es et eu fa fi
374 +-------------------------------------------------+
375 a2ps | [] [] [] [] [] [] [] [] |
376 aegis | [] [] [] |
377 ant-phone | [] () |
378 anubis | [] [] [] |
379 aspell | [] [] [] [] [] |
380 bash | [] [] [] [] |
381 bfd | [] [] |
382 bibshelf | [] [] [] [] |
383 binutils | [] [] |
384 bison | [] [] [] |
385 bison-runtime | [] [] [] [] [] |
386 bluez-pin | [] [] [] [] [] [] [] |
387 bombono-dvd | [] [] |
388 buzztard | [] [] [] |
389 cflow | [] [] [] |
390 clisp | [] [] [] [] |
391 coreutils | [] [] [] [] |
392 cpio | [] |
393 cppi | [] |
394 cpplib | [] [] [] |
395 cryptsetup | [] |
396 dfarc | [] [] [] [] |
397 dialog | [] [] [] [] [] |
398 dico | |
399 diffutils | [] [] [] [] [] [] [] |
400 dink | [] [] [] |
401 doodle | [] |
402 e2fsprogs | [] [] [] |
403 enscript | [] [] [] |
404 exif | () [] [] [] |
405 fetchmail | [] [] () [] [] [] |
406 findutils | [] [] [] [] |
407 flex | [] [] [] |
408 freedink | [] [] [] [] |
409 gas | [] |
410 gawk | [] [] [] |
411 gcal | [] |
412 gcc | [] [] |
413 gettext-examples | [] [] [] [] [] |
414 gettext-runtime | [] [] [] [] [] |
415 gettext-tools | [] [] [] |
416 gip | [] [] [] [] [] |
417 gjay | [] [] |
418 gliv | [] [] [] [] |
419 glunarclock | [] [] [] |
420 gnubiff | () |
421 gnucash | [] () () () () () |
422 gnuedu | [] [] |
423 gnulib | [] [] [] |
424 gnunet | |
425 gnunet-gtk | [] |
426 gnutls | [] [] |
427 gold | [] [] |
428 gpe-aerial | [] [] [] [] [] |
429 gpe-beam | [] [] [] [] [] |
430 gpe-bluetooth | [] [] [] |
431 gpe-calendar | [] [] |
432 gpe-clock | [] [] [] [] [] |
433 gpe-conf | [] [] [] [] |
434 gpe-contacts | [] [] [] [] |
435 gpe-edit | [] [] [] |
436 gpe-filemanager | [] [] [] [] |
437 gpe-go | [] [] [] [] [] |
438 gpe-login | [] [] [] |
439 gpe-ownerinfo | [] [] [] [] [] |
440 gpe-package | [] [] [] [] |
441 gpe-sketchbook | [] [] [] [] [] |
442 gpe-su | [] [] [] [] [] |
443 gpe-taskmanager | [] [] [] [] [] |
444 gpe-timesheet | [] [] [] [] [] |
445 gpe-today | [] [] [] [] [] |
446 gpe-todo | [] [] [] [] |
447 gphoto2 | [] [] () [] [] [] [] |
448 gprof | [] [] [] [] |
449 gpsdrive | [] [] [] |
450 gramadoir | [] [] [] |
451 grep | [] [] |
452 grub | [] [] [] |
453 gsasl | [] [] |
454 gss | [] |
455 gst-plugins-bad | [] [] [] [] [] [] |
456 gst-plugins-base | [] [] [] [] [] [] |
457 gst-plugins-good | [] [] [] [] [] [] [] |
458 gst-plugins-ugly | [] [] [] [] [] [] [] |
459 gstreamer | [] [] [] [] [] [] |
460 gtick | [] () [] [] |
461 gtkam | [] [] () [] [] |
462 gtkorphan | [] [] [] [] |
463 gtkspell | [] [] [] [] [] [] [] [] |
464 gutenprint | [] [] [] [] |
465 hello | [] [] [] [] [] |
466 help2man | [] [] |
467 hylafax | [] [] |
468 idutils | [] [] [] |
469 indent | [] [] [] [] [] [] [] [] |
470 iso_15924 | [] () [] [] [] |
471 iso_3166 | [] [] [] () [] [] [] () [] |
472 iso_3166_2 | () |
473 iso_4217 | [] [] [] () [] [] [] |
474 iso_639 | [] [] [] () [] [] [] |
475 iso_639_3 | |
476 jwhois | [] [] |
477 kbd | [] [] [] [] [] |
478 keytouch | [] [] [] |
479 keytouch-editor | [] [] [] |
480 keytouch-keyboa... | [] [] |
481 klavaro | [] [] [] [] |
482 latrine | [] () [] |
483 ld | [] [] [] |
484 leafpad | [] [] [] [] [] [] [] |
485 libc | [] [] [] [] [] |
486 libexif | [] [] () |
487 libextractor | |
488 libgnutls | [] |
489 libgpewidget | [] [] [] |
490 libgpg-error | [] [] |
491 libgphoto2 | [] () |
492 libgphoto2_port | [] () [] |
493 libgsasl | [] |
494 libiconv | [] [] [] [] [] [] |
495 libidn | [] [] [] [] |
496 lifelines | [] () |
497 liferea | [] [] [] [] [] |
498 lilypond | [] [] [] [] |
499 linkdr | [] [] [] [] |
500 lordsawar | [] |
501 lprng | |
502 lynx | [] [] [] [] |
503 m4 | [] [] [] [] [] |
504 mailfromd | |
505 mailutils | [] |
506 make | [] [] [] [] |
507 man-db | |
508 man-db-manpages | |
509 minicom | [] [] [] [] [] |
510 mkisofs | [] |
511 myserver | |
512 nano | [] [] [] [] |
513 opcodes | [] [] [] |
514 parted | [] [] |
515 pies | |
516 popt | [] [] [] [] [] [] |
517 psmisc | [] [] [] [] |
518 pspp | [] |
519 pwdutils | [] |
520 radius | [] |
521 recode | [] [] [] [] [] [] [] |
522 rosegarden | () () () () |
523 rpm | [] [] [] |
524 rush | |
525 sarg | |
526 screem | |
527 scrollkeeper | [] [] [] [] [] [] |
528 sed | [] [] [] [] [] [] [] |
529 sharutils | [] [] [] [] [] |
530 shishi | |
531 skencil | [] () [] |
532 solfege | [] [] [] [] |
533 solfege-manual | [] [] |
534 soundtracker | [] [] [] |
535 sp | [] |
536 sysstat | [] [] [] [] |
537 tar | [] [] [] [] [] |
538 texinfo | [] [] [] |
539 tin | [] [] |
540 unicode-han-tra... | |
541 unicode-transla... | |
542 util-linux-ng | [] [] [] [] [] |
543 vice | () () |
544 vmm | [] |
545 vorbis-tools | [] [] |
546 wastesedge | [] |
547 wdiff | [] [] [] |
548 wget | [] [] [] [] |
549 wyslij-po | [] |
550 xchat | [] [] [] [] [] [] |
551 xdg-user-dirs | [] [] [] [] [] [] [] [] [] |
552 xkeyboard-config | [] [] [] [] [] [] |
553 +-------------------------------------------------+
554 cs da de el en en_GB en_ZA eo es et eu fa fi
555 64 105 117 18 1 8 0 28 89 18 19 0 104
556
557 fr ga gl gu he hi hr hu hy id is it ja ka kn
558 +------------------------------------------------+
559 a2ps | [] [] [] |
560 aegis | [] [] |
561 ant-phone | [] [] |
562 anubis | [] [] [] |
563 aspell | [] [] [] [] |
564 bash | [] [] [] |
565 bfd | [] [] |
566 bibshelf | [] [] [] [] |
567 binutils | [] [] |
568 bison | [] [] [] |
569 bison-runtime | [] [] [] [] [] |
570 bluez-pin | [] [] [] [] [] [] [] |
571 bombono-dvd | |
572 buzztard | [] |
573 cflow | [] [] |
574 clisp | [] |
575 coreutils | [] [] [] [] [] |
576 cpio | [] [] [] |
577 cppi | [] |
578 cpplib | [] [] |
579 cryptsetup | [] [] [] |
580 dfarc | [] [] |
581 dialog | [] [] [] [] [] [] [] |
582 dico | |
583 diffutils | [] [] [] [] [] [] [] [] |
584 dink | [] |
585 doodle | [] [] |
586 e2fsprogs | [] [] |
587 enscript | [] [] [] [] |
588 exif | [] [] [] [] [] |
589 fetchmail | [] [] [] [] |
590 findutils | [] [] [] [] [] |
591 flex | [] [] |
592 freedink | [] [] |
593 gas | [] [] |
594 gawk | [] [] [] [] () [] |
595 gcal | [] |
596 gcc | [] |
597 gettext-examples | [] [] [] [] [] [] |
598 gettext-runtime | [] [] [] [] [] |
599 gettext-tools | [] [] [] [] |
600 gip | [] [] [] [] [] |
601 gjay | |
602 gliv | () |
603 glunarclock | [] [] [] |
604 gnubiff | () [] () |
605 gnucash | () () () () [] |
606 gnuedu | [] [] |
607 gnulib | [] [] [] [] [] |
608 gnunet | |
609 gnunet-gtk | [] |
610 gnutls | [] [] |
611 gold | [] |
612 gpe-aerial | [] [] |
613 gpe-beam | [] [] [] |
614 gpe-bluetooth | [] [] [] |
615 gpe-calendar | [] |
616 gpe-clock | [] [] [] [] |
617 gpe-conf | [] [] [] |
618 gpe-contacts | [] [] [] |
619 gpe-edit | [] [] |
620 gpe-filemanager | [] [] [] |
621 gpe-go | [] [] [] [] |
622 gpe-login | [] [] |
623 gpe-ownerinfo | [] [] [] [] |
624 gpe-package | [] [] |
625 gpe-sketchbook | [] [] [] |
626 gpe-su | [] [] [] [] [] |
627 gpe-taskmanager | [] [] [] [] |
628 gpe-timesheet | [] [] [] [] |
629 gpe-today | [] [] [] [] [] [] |
630 gpe-todo | [] [] |
631 gphoto2 | [] [] [] [] [] |
632 gprof | [] [] [] |
633 gpsdrive | [] [] [] |
634 gramadoir | [] [] [] |
635 grep | [] |
636 grub | [] [] [] |
637 gsasl | [] [] [] [] |
638 gss | [] [] [] [] |
639 gst-plugins-bad | [] [] [] [] |
640 gst-plugins-base | [] [] [] [] [] |
641 gst-plugins-good | [] [] [] [] [] |
642 gst-plugins-ugly | [] [] [] [] [] |
643 gstreamer | [] [] [] [] |
644 gtick | [] [] [] [] |
645 gtkam | [] [] [] [] [] |
646 gtkorphan | [] [] [] |
647 gtkspell | [] [] [] [] [] [] [] [] |
648 gutenprint | [] [] [] |
649 hello | [] [] |
650 help2man | [] |
651 hylafax | [] |
652 idutils | [] [] [] [] [] |
653 indent | [] [] [] [] [] [] [] |
654 iso_15924 | () [] [] |
655 iso_3166 | () [] [] [] [] [] [] [] [] [] [] |
656 iso_3166_2 | () [] [] [] |
657 iso_4217 | () [] [] [] [] |
658 iso_639 | () [] [] [] [] [] [] [] |
659 iso_639_3 | () [] [] |
660 jwhois | [] [] [] [] |
661 kbd | [] [] |
662 keytouch | [] [] [] [] [] |
663 keytouch-editor | [] [] [] [] |
664 keytouch-keyboa... | [] [] [] [] |
665 klavaro | [] [] |
666 latrine | [] [] |
667 ld | [] [] [] |
668 leafpad | [] [] [] [] [] [] () |
669 libc | [] [] [] [] |
670 libexif | |
671 libextractor | |
672 libgnutls | [] [] |
673 libgpewidget | [] [] [] |
674 libgpg-error | [] [] |
675 libgphoto2 | [] [] [] |
676 libgphoto2_port | [] [] [] |
677 libgsasl | [] [] [] [] |
678 libiconv | [] [] [] [] [] |
679 libidn | [] [] [] |
680 lifelines | () |
681 liferea | [] [] [] [] |
682 lilypond | [] |
683 linkdr | [] [] [] [] |
684 lordsawar | |
685 lprng | [] |
686 lynx | [] [] [] [] [] |
687 m4 | [] [] [] [] [] |
688 mailfromd | |
689 mailutils | [] [] |
690 make | [] [] [] [] [] [] [] [] |
691 man-db | [] [] |
692 man-db-manpages | [] |
693 minicom | [] [] [] [] |
694 mkisofs | [] [] [] |
695 myserver | |
696 nano | [] [] [] [] [] |
697 opcodes | [] [] [] |
698 parted | [] [] [] [] |
699 pies | |
700 popt | [] [] [] [] [] [] [] [] |
701 psmisc | [] [] |
702 pspp | |
703 pwdutils | [] [] |
704 radius | [] [] |
705 recode | [] [] [] [] [] [] [] |
706 rosegarden | () () () () |
707 rpm | [] [] |
708 rush | |
709 sarg | [] |
710 screem | [] [] |
711 scrollkeeper | [] [] [] |
712 sed | [] [] [] [] [] [] [] |
713 sharutils | [] [] [] [] [] [] |
714 shishi | [] |
715 skencil | [] |
716 solfege | [] [] [] |
717 solfege-manual | [] [] |
718 soundtracker | [] [] |
719 sp | [] () |
720 sysstat | [] [] [] [] |
721 tar | [] [] [] [] [] [] |
722 texinfo | [] [] [] [] |
723 tin | [] |
724 unicode-han-tra... | |
725 unicode-transla... | [] [] |
726 util-linux-ng | [] [] [] [] [] |
727 vice | () () () |
728 vmm | [] |
729 vorbis-tools | [] |
730 wastesedge | () () |
731 wdiff | |
732 wget | [] [] [] [] [] [] [] |
733 wyslij-po | [] [] |
734 xchat | [] [] [] [] [] [] [] [] |
735 xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] |
736 xkeyboard-config | [] [] [] [] |
737 +------------------------------------------------+
738 fr ga gl gu he hi hr hu hy id is it ja ka kn
739 121 53 20 4 8 2 5 53 2 120 5 83 66 0 4
740
741 ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
742 +-----------------------------------------------+
743 a2ps | [] |
744 aegis | |
745 ant-phone | |
746 anubis | [] [] |
747 aspell | [] |
748 bash | |
749 bfd | |
750 bibshelf | [] [] |
751 binutils | |
752 bison | [] |
753 bison-runtime | [] [] [] [] [] |
754 bluez-pin | [] [] [] [] [] |
755 bombono-dvd | |
756 buzztard | |
757 cflow | |
758 clisp | |
759 coreutils | [] |
760 cpio | |
761 cppi | |
762 cpplib | |
763 cryptsetup | |
764 dfarc | [] |
765 dialog | [] [] [] [] [] |
766 dico | |
767 diffutils | [] [] |
768 dink | |
769 doodle | |
770 e2fsprogs | |
771 enscript | |
772 exif | [] |
773 fetchmail | |
774 findutils | |
775 flex | |
776 freedink | [] |
777 gas | |
778 gawk | |
779 gcal | |
780 gcc | |
781 gettext-examples | [] [] [] [] |
782 gettext-runtime | [] |
783 gettext-tools | [] |
784 gip | [] [] |
785 gjay | |
786 gliv | |
787 glunarclock | [] |
788 gnubiff | |
789 gnucash | () () () () |
790 gnuedu | |
791 gnulib | |
792 gnunet | |
793 gnunet-gtk | |
794 gnutls | [] |
795 gold | |
796 gpe-aerial | [] |
797 gpe-beam | [] |
798 gpe-bluetooth | [] [] |
799 gpe-calendar | [] |
800 gpe-clock | [] [] [] [] [] |
801 gpe-conf | [] [] |
802 gpe-contacts | [] [] |
803 gpe-edit | [] |
804 gpe-filemanager | [] [] |
805 gpe-go | [] [] [] |
806 gpe-login | [] |
807 gpe-ownerinfo | [] [] |
808 gpe-package | [] [] |
809 gpe-sketchbook | [] [] |
810 gpe-su | [] [] [] [] [] [] |
811 gpe-taskmanager | [] [] [] [] [] [] |
812 gpe-timesheet | [] [] |
813 gpe-today | [] [] [] [] |
814 gpe-todo | [] [] |
815 gphoto2 | |
816 gprof | [] |
817 gpsdrive | |
818 gramadoir | |
819 grep | |
820 grub | |
821 gsasl | |
822 gss | |
823 gst-plugins-bad | [] [] |
824 gst-plugins-base | [] [] |
825 gst-plugins-good | [] [] |
826 gst-plugins-ugly | [] [] [] [] [] |
827 gstreamer | |
828 gtick | |
829 gtkam | [] |
830 gtkorphan | [] [] |
831 gtkspell | [] [] [] [] [] [] [] |
832 gutenprint | |
833 hello | [] [] [] |
834 help2man | |
835 hylafax | |
836 idutils | |
837 indent | |
838 iso_15924 | [] [] |
839 iso_3166 | [] [] () [] [] [] [] [] |
840 iso_3166_2 | |
841 iso_4217 | [] [] |
842 iso_639 | [] [] |
843 iso_639_3 | [] |
844 jwhois | [] |
845 kbd | |
846 keytouch | [] |
847 keytouch-editor | [] |
848 keytouch-keyboa... | [] |
849 klavaro | [] |
850 latrine | [] |
851 ld | |
852 leafpad | [] [] [] |
853 libc | [] |
854 libexif | |
855 libextractor | |
856 libgnutls | [] |
857 libgpewidget | [] [] |
858 libgpg-error | |
859 libgphoto2 | |
860 libgphoto2_port | |
861 libgsasl | |
862 libiconv | |
863 libidn | |
864 lifelines | |
865 liferea | |
866 lilypond | |
867 linkdr | |
868 lordsawar | |
869 lprng | |
870 lynx | |
871 m4 | |
872 mailfromd | |
873 mailutils | |
874 make | [] |
875 man-db | |
876 man-db-manpages | |
877 minicom | [] |
878 mkisofs | |
879 myserver | |
880 nano | [] [] |
881 opcodes | |
882 parted | |
883 pies | |
884 popt | [] [] [] |
885 psmisc | |
886 pspp | |
887 pwdutils | |
888 radius | |
889 recode | |
890 rosegarden | |
891 rpm | |
892 rush | |
893 sarg | |
894 screem | |
895 scrollkeeper | [] [] |
896 sed | |
897 sharutils | |
898 shishi | |
899 skencil | |
900 solfege | [] |
901 solfege-manual | |
902 soundtracker | |
903 sp | |
904 sysstat | [] |
905 tar | [] |
906 texinfo | [] |
907 tin | |
908 unicode-han-tra... | |
909 unicode-transla... | |
910 util-linux-ng | |
911 vice | |
912 vmm | |
913 vorbis-tools | |
914 wastesedge | |
915 wdiff | |
916 wget | [] |
917 wyslij-po | |
918 xchat | [] [] [] |
919 xdg-user-dirs | [] [] [] [] [] [] [] [] |
920 xkeyboard-config | [] [] [] |
921 +-----------------------------------------------+
922 ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
923 20 5 10 1 12 48 4 2 2 4 24 10 19 3 1
924
925 nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr
926 +---------------------------------------------------+
927 a2ps | [] [] [] [] [] [] [] [] |
928 aegis | [] [] [] |
929 ant-phone | [] [] |
930 anubis | [] [] [] |
931 aspell | [] [] [] [] [] |
932 bash | [] [] |
933 bfd | [] |
934 bibshelf | [] [] |
935 binutils | [] [] |
936 bison | [] [] [] |
937 bison-runtime | [] [] [] [] [] [] [] |
938 bluez-pin | [] [] [] [] [] [] [] [] |
939 bombono-dvd | [] () |
940 buzztard | [] [] |
941 cflow | [] |
942 clisp | [] [] |
943 coreutils | [] [] [] [] [] [] |
944 cpio | [] [] [] |
945 cppi | [] |
946 cpplib | [] |
947 cryptsetup | [] |
948 dfarc | [] |
949 dialog | [] [] [] [] |
950 dico | [] |
951 diffutils | [] [] [] [] [] [] |
952 dink | () |
953 doodle | [] [] |
954 e2fsprogs | [] [] |
955 enscript | [] [] [] [] [] |
956 exif | [] [] [] () [] |
957 fetchmail | [] [] [] [] |
958 findutils | [] [] [] [] [] |
959 flex | [] [] [] [] [] |
960 freedink | [] [] |
961 gas | |
962 gawk | [] [] [] [] |
963 gcal | |
964 gcc | [] |
965 gettext-examples | [] [] [] [] [] [] [] [] |
966 gettext-runtime | [] [] [] [] [] [] [] [] [] |
967 gettext-tools | [] [] [] [] [] [] |
968 gip | [] [] [] [] [] |
969 gjay | |
970 gliv | [] [] [] [] [] [] |
971 glunarclock | [] [] [] [] [] |
972 gnubiff | [] () |
973 gnucash | [] () () () |
974 gnuedu | [] |
975 gnulib | [] [] [] [] |
976 gnunet | |
977 gnunet-gtk | |
978 gnutls | [] [] |
979 gold | |
980 gpe-aerial | [] [] [] [] [] [] [] |
981 gpe-beam | [] [] [] [] [] [] [] |
982 gpe-bluetooth | [] [] |
983 gpe-calendar | [] [] [] [] |
984 gpe-clock | [] [] [] [] [] [] [] [] |
985 gpe-conf | [] [] [] [] [] [] [] |
986 gpe-contacts | [] [] [] [] [] |
987 gpe-edit | [] [] [] |
988 gpe-filemanager | [] [] [] |
989 gpe-go | [] [] [] [] [] [] [] [] |
990 gpe-login | [] [] |
991 gpe-ownerinfo | [] [] [] [] [] [] [] [] |
992 gpe-package | [] [] |
993 gpe-sketchbook | [] [] [] [] [] [] [] |
994 gpe-su | [] [] [] [] [] [] [] [] |
995 gpe-taskmanager | [] [] [] [] [] [] [] [] |
996 gpe-timesheet | [] [] [] [] [] [] [] [] |
997 gpe-today | [] [] [] [] [] [] [] [] |
998 gpe-todo | [] [] [] [] [] |
999 gphoto2 | [] [] [] [] [] [] [] [] |
1000 gprof | [] [] [] |
1001 gpsdrive | [] [] |
1002 gramadoir | [] [] |
1003 grep | [] [] [] [] |
1004 grub | [] [] [] |
1005 gsasl | [] [] [] [] |
1006 gss | [] [] [] |
1007 gst-plugins-bad | [] [] [] [] [] |
1008 gst-plugins-base | [] [] [] [] [] |
1009 gst-plugins-good | [] [] [] [] [] |
1010 gst-plugins-ugly | [] [] [] [] [] [] |
1011 gstreamer | [] [] [] [] [] |
1012 gtick | [] [] [] |
1013 gtkam | [] [] [] [] [] [] |
1014 gtkorphan | [] |
1015 gtkspell | [] [] [] [] [] [] [] [] [] [] |
1016 gutenprint | [] [] |
1017 hello | [] [] [] [] |
1018 help2man | [] [] |
1019 hylafax | [] |
1020 idutils | [] [] [] [] [] |
1021 indent | [] [] [] [] [] [] [] |
1022 iso_15924 | [] [] [] [] |
1023 iso_3166 | [] [] [] [] [] () [] [] [] [] [] [] [] [] |
1024 iso_3166_2 | [] [] [] |
1025 iso_4217 | [] [] [] [] [] [] [] [] |
1026 iso_639 | [] [] [] [] [] [] [] [] [] |
1027 iso_639_3 | [] [] |
1028 jwhois | [] [] [] [] |
1029 kbd | [] [] [] |
1030 keytouch | [] [] [] |
1031 keytouch-editor | [] [] [] |
1032 keytouch-keyboa... | [] [] [] |
1033 klavaro | [] [] |
1034 latrine | [] [] |
1035 ld | |
1036 leafpad | [] [] [] [] [] [] [] [] [] |
1037 libc | [] [] [] [] |
1038 libexif | [] [] () [] |
1039 libextractor | |
1040 libgnutls | [] [] |
1041 libgpewidget | [] [] [] |
1042 libgpg-error | [] [] |
1043 libgphoto2 | [] [] |
1044 libgphoto2_port | [] [] [] [] |
1045 libgsasl | [] [] [] [] [] |
1046 libiconv | [] [] [] [] [] |
1047 libidn | [] [] |
1048 lifelines | [] [] |
1049 liferea | [] [] [] [] [] () () [] |
1050 lilypond | [] |
1051 linkdr | [] [] [] |
1052 lordsawar | |
1053 lprng | [] |
1054 lynx | [] [] [] |
1055 m4 | [] [] [] [] [] |
1056 mailfromd | [] |
1057 mailutils | [] |
1058 make | [] [] [] [] |
1059 man-db | [] [] [] |
1060 man-db-manpages | [] [] [] |
1061 minicom | [] [] [] [] |
1062 mkisofs | [] [] [] |
1063 myserver | |
1064 nano | [] [] [] [] |
1065 opcodes | [] [] |
1066 parted | [] [] [] [] |
1067 pies | [] |
1068 popt | [] [] [] [] |
1069 psmisc | [] [] [] |
1070 pspp | [] [] |
1071 pwdutils | [] |
1072 radius | [] [] [] |
1073 recode | [] [] [] [] [] [] [] [] |
1074 rosegarden | () () |
1075 rpm | [] [] [] |
1076 rush | [] [] |
1077 sarg | |
1078 screem | |
1079 scrollkeeper | [] [] [] [] [] [] [] [] |
1080 sed | [] [] [] [] [] [] [] [] [] |
1081 sharutils | [] [] [] [] |
1082 shishi | [] |
1083 skencil | [] [] |
1084 solfege | [] [] [] [] |
1085 solfege-manual | [] [] [] |
1086 soundtracker | [] |
1087 sp | |
1088 sysstat | [] [] [] [] |
1089 tar | [] [] [] [] |
1090 texinfo | [] [] [] [] |
1091 tin | [] |
1092 unicode-han-tra... | |
1093 unicode-transla... | |
1094 util-linux-ng | [] [] [] [] [] |
1095 vice | [] |
1096 vmm | [] |
1097 vorbis-tools | [] [] |
1098 wastesedge | [] |
1099 wdiff | [] [] |
1100 wget | [] [] [] [] [] [] [] |
1101 wyslij-po | [] [] [] |
1102 xchat | [] [] [] [] [] [] [] [] [] |
1103 xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] [] |
1104 xkeyboard-config | [] [] [] [] [] |
1105 +---------------------------------------------------+
1106 nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr
1107 135 10 4 7 105 1 29 61 47 91 3 55 47 8 37
1108
1109 sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW
1110 +---------------------------------------------------+
1111 a2ps | [] [] [] [] [] | 27
1112 aegis | [] | 9
1113 ant-phone | [] [] [] [] | 9
1114 anubis | [] [] [] [] | 15
1115 aspell | [] [] [] | 20
1116 bash | [] [] | 11
1117 bfd | [] | 6
1118 bibshelf | [] [] [] | 16
1119 binutils | [] [] | 8
1120 bison | [] [] | 12
1121 bison-runtime | [] [] [] [] [] [] | 29
1122 bluez-pin | [] [] [] [] [] [] [] [] | 37
1123 bombono-dvd | [] | 4
1124 buzztard | [] | 7
1125 cflow | [] [] [] | 9
1126 clisp | | 10
1127 coreutils | [] [] [] [] | 22
1128 cpio | [] [] [] [] [] [] | 13
1129 cppi | [] [] | 5
1130 cpplib | [] [] [] [] [] [] | 13
1131 cryptsetup | [] [] | 7
1132 dfarc | [] | 9
1133 dialog | [] [] [] [] [] [] [] | 30
1134 dico | [] | 2
1135 diffutils | [] [] [] [] [] [] | 30
1136 dink | | 4
1137 doodle | [] [] | 7
1138 e2fsprogs | [] [] [] | 11
1139 enscript | [] [] [] [] | 17
1140 exif | [] [] [] | 16
1141 fetchmail | [] [] [] | 17
1142 findutils | [] [] [] [] [] | 20
1143 flex | [] [] [] [] | 15
1144 freedink | [] | 10
1145 gas | [] | 4
1146 gawk | [] [] [] [] | 18
1147 gcal | [] [] | 5
1148 gcc | [] [] [] | 7
1149 gettext-examples | [] [] [] [] [] [] [] | 34
1150 gettext-runtime | [] [] [] [] [] [] [] | 30
1151 gettext-tools | [] [] [] [] [] [] | 22
1152 gip | [] [] [] [] | 22
1153 gjay | [] | 3
1154 gliv | [] [] [] | 14
1155 glunarclock | [] [] [] [] [] | 19
1156 gnubiff | [] [] | 4
1157 gnucash | () [] () () | 9
1158 gnuedu | [] [] | 7
1159 gnulib | [] [] [] [] | 16
1160 gnunet | [] | 1
1161 gnunet-gtk | [] [] [] | 5
1162 gnutls | [] [] [] | 10
1163 gold | [] | 4
1164 gpe-aerial | [] [] [] | 18
1165 gpe-beam | [] [] [] | 19
1166 gpe-bluetooth | [] [] [] | 13
1167 gpe-calendar | [] [] [] [] | 12
1168 gpe-clock | [] [] [] [] [] | 28
1169 gpe-conf | [] [] [] [] | 20
1170 gpe-contacts | [] [] [] | 17
1171 gpe-edit | [] [] [] | 12
1172 gpe-filemanager | [] [] [] [] | 16
1173 gpe-go | [] [] [] [] [] | 25
1174 gpe-login | [] [] [] | 11
1175 gpe-ownerinfo | [] [] [] [] [] | 25
1176 gpe-package | [] [] [] | 13
1177 gpe-sketchbook | [] [] [] | 20
1178 gpe-su | [] [] [] [] [] | 30
1179 gpe-taskmanager | [] [] [] [] [] | 29
1180 gpe-timesheet | [] [] [] [] [] | 25
1181 gpe-today | [] [] [] [] [] [] | 30
1182 gpe-todo | [] [] [] [] | 17
1183 gphoto2 | [] [] [] [] [] | 24
1184 gprof | [] [] [] | 15
1185 gpsdrive | [] [] [] | 11
1186 gramadoir | [] [] [] | 11
1187 grep | [] [] [] | 10
1188 grub | [] [] [] | 14
1189 gsasl | [] [] [] [] | 14
1190 gss | [] [] [] | 11
1191 gst-plugins-bad | [] [] [] [] | 22
1192 gst-plugins-base | [] [] [] [] [] | 24
1193 gst-plugins-good | [] [] [] [] [] | 25
1194 gst-plugins-ugly | [] [] [] [] [] | 29
1195 gstreamer | [] [] [] [] | 22
1196 gtick | [] [] [] | 13
1197 gtkam | [] [] [] | 20
1198 gtkorphan | [] [] [] | 14
1199 gtkspell | [] [] [] [] [] [] [] [] [] | 45
1200 gutenprint | [] | 10
1201 hello | [] [] [] [] [] [] | 21
1202 help2man | [] [] | 7
1203 hylafax | [] | 5
1204 idutils | [] [] [] [] | 17
1205 indent | [] [] [] [] [] [] | 30
1206 iso_15924 | () [] () [] [] | 16
1207 iso_3166 | [] [] () [] [] () [] [] [] () | 53
1208 iso_3166_2 | () [] () [] | 9
1209 iso_4217 | [] () [] [] () [] [] | 26
1210 iso_639 | [] [] [] () [] () [] [] [] [] | 38
1211 iso_639_3 | [] () | 8
1212 jwhois | [] [] [] [] [] | 16
1213 kbd | [] [] [] [] [] | 15
1214 keytouch | [] [] [] | 16
1215 keytouch-editor | [] [] [] | 14
1216 keytouch-keyboa... | [] [] [] | 14
1217 klavaro | [] | 11
1218 latrine | [] [] [] | 10
1219 ld | [] [] [] [] | 11
1220 leafpad | [] [] [] [] [] [] | 33
1221 libc | [] [] [] [] [] | 21
1222 libexif | [] () | 6
1223 libextractor | [] | 1
1224 libgnutls | [] [] [] | 9
1225 libgpewidget | [] [] [] | 14
1226 libgpg-error | [] [] [] | 9
1227 libgphoto2 | [] [] | 8
1228 libgphoto2_port | [] [] [] [] | 13
1229 libgsasl | [] [] [] | 13
1230 libiconv | [] [] [] [] | 21
1231 libidn | () [] [] | 11
1232 lifelines | [] | 4
1233 liferea | [] [] [] | 21
1234 lilypond | [] | 7
1235 linkdr | [] [] [] [] [] | 17
1236 lordsawar | | 1
1237 lprng | [] | 3
1238 lynx | [] [] [] [] | 17
1239 m4 | [] [] [] [] | 19
1240 mailfromd | [] [] | 3
1241 mailutils | [] | 5
1242 make | [] [] [] [] | 21
1243 man-db | [] [] [] | 8
1244 man-db-manpages | | 4
1245 minicom | [] [] | 16
1246 mkisofs | [] [] | 9
1247 myserver | | 0
1248 nano | [] [] [] [] | 21
1249 opcodes | [] [] [] | 11
1250 parted | [] [] [] [] [] | 15
1251 pies | [] [] | 3
1252 popt | [] [] [] [] [] [] | 27
1253 psmisc | [] [] | 11
1254 pspp | | 4
1255 pwdutils | [] [] | 6
1256 radius | [] [] | 9
1257 recode | [] [] [] [] | 28
1258 rosegarden | () | 0
1259 rpm | [] [] [] | 11
1260 rush | [] [] | 4
1261 sarg | | 1
1262 screem | [] | 3
1263 scrollkeeper | [] [] [] [] [] | 27
1264 sed | [] [] [] [] [] | 30
1265 sharutils | [] [] [] [] [] | 22
1266 shishi | [] | 3
1267 skencil | [] [] | 7
1268 solfege | [] [] [] [] | 16
1269 solfege-manual | [] | 8
1270 soundtracker | [] [] [] | 9
1271 sp | [] | 3
1272 sysstat | [] [] | 15
1273 tar | [] [] [] [] [] [] | 23
1274 texinfo | [] [] [] [] | 16
1275 tin | | 4
1276 unicode-han-tra... | | 0
1277 unicode-transla... | | 2
1278 util-linux-ng | [] [] [] [] | 20
1279 vice | () () | 1
1280 vmm | [] | 4
1281 vorbis-tools | [] | 6
1282 wastesedge | | 2
1283 wdiff | [] [] | 7
1284 wget | [] [] [] [] [] | 26
1285 wyslij-po | [] [] | 8
1286 xchat | [] [] [] [] [] [] | 36
1287 xdg-user-dirs | [] [] [] [] [] [] [] [] [] | 60
1288 xkeyboard-config | [] [] [] [] | 25
1289 +---------------------------------------------------+
1290 84 teams sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW
1291 178 domains 119 1 3 2 0 10 66 50 155 17 97 7 41 2610
1292
1293 Some counters in the preceding matrix are higher than the number of
1294visible blocks let us expect. This is because a few extra PO files are
1295used for implementing regional variants of languages, or language
1296dialects.
1297
1298 For a PO file in the matrix above to be effective, the package to
1299which it applies should also have been internationalized and
1300distributed as such by its maintainer. There might be an observable
1301lag between the mere existence a PO file and its wide availability in a
1302distribution.
1303
1304 If May 2010 seems to be old, you may fetch a more recent copy of
1305this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date
1306matrix with full percentage details can be found at
1307`http://translationproject.org/extra/matrix.html'.
1308
13091.6 Using `gettext' in new packages
1310===================================
1311
1312If you are writing a freely available program and want to
1313internationalize it you are welcome to use GNU `gettext' in your
1314package. Of course you have to respect the GNU Library General Public
1315License which covers the use of the GNU `gettext' library. This means
1316in particular that even non-free programs can use `libintl' as a shared
1317library, whereas only free software can use `libintl' as a static
1318library or use modified versions of `libintl'.
1319
1320 Once the sources are changed appropriately and the setup can handle
1321the use of `gettext' the only thing missing are the translations. The
1322Free Translation Project is also available for packages which are not
1323developed inside the GNU project. Therefore the information given above
1324applies also for every other Free Software Project. Contact
1325`coordinator@translationproject.org' to make the `.pot' files available
1326to the translation teams.
1327
01328
=== removed file 'AUTHORS'
--- AUTHORS 2008-06-09 11:56:12 +0000
+++ AUTHORS 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1Emmanuele Bassi <ebassi@openedhand.com>
20
=== modified file 'ChangeLog'
--- ChangeLog 2011-05-18 15:01:29 +0000
+++ ChangeLog 2011-06-20 20:11:46 +0000
@@ -1,3 +1,530 @@
1commit 02b3ee77a35624a3d6e478ae3700100cb24bf18f
2Author: Emmanuele Bassi <ebassi@linux.intel.com>
3Date: Wed Jun 15 11:08:37 2011 +0100
4
5 Release JSON-GLib 0.13.4
6
7 NEWS | 6 ++++++
8 configure.ac | 2 +-
9 2 files changed, 7 insertions(+), 1 deletions(-)
10
11commit f37878ec1759283f78a6d580c1f78e9039717862
12Author: Emmanuele Bassi <ebassi@linux.intel.com>
13Date: Wed Jun 15 11:08:12 2011 +0100
14
15 docs: Fix API reference missing symbols
16
17 doc/reference/json-glib-sections.txt | 4 ++++
18 json-glib/json-gobject.h | 6 ++++++
19 2 files changed, 10 insertions(+), 0 deletions(-)
20
21commit c994a9bfdc13aba1b7c5fd019853c68fb38148a6
22Author: Emmanuele Bassi <ebassi@linux.intel.com>
23Date: Thu Jun 9 17:23:04 2011 +0100
24
25 Remove G_CONST_RETURN usage
26
27 See GLib bug:
28
29 https://bugzilla.gnome.org/show_bug.cgi?id=644611
30
31 The macro is going to be deprecated soon.
32
33 json-glib/json-array.c | 2 +-
34 json-glib/json-node.c | 6 +++---
35 json-glib/json-object.c | 2 +-
36 json-glib/json-reader.c | 6 +++---
37 json-glib/json-reader.h | 6 +++---
38 json-glib/json-types-private.h | 2 +-
39 json-glib/json-types.h | 8 ++++----
40 7 files changed, 16 insertions(+), 16 deletions(-)
41
42commit 74bb5d61a737cceffd04c8d9ae8d5db390eda5a2
43Author: Emmanuele Bassi <ebassi@linux.intel.com>
44Date: Fri Jun 3 11:46:05 2011 +0100
45
46 Use the new atomic functions for refcounting
47
48 The newly added g_atomic_int_dec_and_test() simplified the logic for
49 unreffing Object and Array.
50
51 json-glib/json-array.c | 9 ++-------
52 json-glib/json-object.c | 9 ++-------
53 2 files changed, 4 insertions(+), 14 deletions(-)
54
55commit 4f83868e3a18adac809aff111c5df5ff7af8fedf
56Author: Emmanuele Bassi <ebassi@linux.intel.com>
57Date: Fri Jun 3 11:18:27 2011 +0100
58
59 build: Remove deprecation disabling for GLib
60
61 json-glib/Makefile.am | 1 -
62 1 files changed, 0 insertions(+), 1 deletions(-)
63
64commit 65a95198a4a1bca7b418af1639c4bb24b09947c5
65Author: Chun-wei Fan <fanchunwei@src.gnome.org>
66Date: Fri Jun 3 15:32:55 2011 +0800
67
68 Visual C++ support: projects for JSONPath test
69
70 Added projects to build test program for JSONPath (path-test.c)
71
72 build/win32/vs10/Makefile.am | 2 +
73 build/win32/vs10/install.vcxproj | 8 ++
74 build/win32/vs10/json-glib.sln | 26 +++--
75 build/win32/vs10/path-test.vcxproj | 159 ++++++++++++++++++++++++++++
76 build/win32/vs10/path-test.vcxproj.filters | 14 +++
77 build/win32/vs9/Makefile.am | 1 +
78 build/win32/vs9/json-glib.sln | 30 ++++--
79 build/win32/vs9/path-test.vcproj | 147 +++++++++++++++++++++++++
80 8 files changed, 371 insertions(+), 16 deletions(-)
81
82commit 16bc9cccd32f4e1c7e9fc0da128aef969d0563b0
83Author: Chun-wei Fan <fanchunwei@src.gnome.org>
84Date: Fri Jun 3 15:01:16 2011 +0800
85
86 Update config.h.win32.in
87
88 Added definition of GETTEXT_PACKAGE due to the addition of the i18n
89 machinery (commit 67edce08670ce1da4956f87948985434ac5ae2ca)
90
91 build/win32/config.h.win32.in | 3 +++
92 1 files changed, 3 insertions(+), 0 deletions(-)
93
94commit d93260c477930140f2ecf2927bd9f2a2d7f4f905
95Author: Chun-wei Fan <fanchunwei@src.gnome.org>
96Date: Fri Jun 3 14:47:42 2011 +0800
97
98 Update VS property sheets
99
100 -Add json-path.h to the list of headers to be copied in the "install" stage
101
102 build/win32/vs10/json-glib.props | 2 ++
103 build/win32/vs9/json-glib.vsprops | 1 +
104 2 files changed, 3 insertions(+), 0 deletions(-)
105
106commit c3b367ca8bac245712f8390acab1b38a314972a9
107Author: Emmanuele Bassi <ebassi@linux.intel.com>
108Date: Wed Jun 1 17:10:17 2011 +0100
109
110 serializable: Fix introspection annotations
111
112 json-glib/json-serializable.c | 25 +++++++++++++++++++++++++
113 1 files changed, 25 insertions(+), 0 deletions(-)
114
115commit aee5a7fbb70e5cb714bcfef79a96c000f62e80db
116Author: Emmanuele Bassi <ebassi@linux.intel.com>
117Date: Wed Jun 1 17:01:02 2011 +0100
118
119 Remove unused files
120
121 - AUTHORS
122 - MAINTAINER
123 replaced by json-glib.doap
124
125 - ChangeLog
126 empty, and not necessary with the foreign automake option
127
128 AUTHORS | 1 -
129 ChangeLog | 6 ------
130 MAINTAINERS | 3 ---
131 configure.ac | 5 +++--
132 4 files changed, 3 insertions(+), 12 deletions(-)
133
134commit 1d4cdb76b6f97c723dd6e4c634bacc52d3199999
135Author: Emmanuele Bassi <ebassi@linux.intel.com>
136Date: Wed Jun 1 13:35:16 2011 +0100
137
138 Update the ignore file for the po directory
139
140 po/.gitignore | 1 +
141 1 files changed, 1 insertions(+), 0 deletions(-)
142
143commit 8863766ca4792383dad0e48550f8fb79d4c104e4
144Author: Emmanuele Bassi <ebassi@linux.intel.com>
145Date: Wed Jun 1 13:21:32 2011 +0100
146
147 Mark GError messages for translations
148
149 These errors might find their way into a UI.
150
151 json-glib/json-gobject.c | 4 ++--
152 json-glib/json-gvariant.c | 40 ++++++++++++++++++----------------------
153 json-glib/json-parser.c | 5 ++++-
154 json-glib/json-path.c | 13 +++++++------
155 json-glib/json-reader.c | 20 ++++++++++----------
156 5 files changed, 41 insertions(+), 41 deletions(-)
157
158commit 67edce08670ce1da4956f87948985434ac5ae2ca
159Author: Emmanuele Bassi <ebassi@linux.intel.com>
160Date: Wed Jun 1 13:09:01 2011 +0100
161
162 Add i18n machinery
163
164 We need to translate the GError messages.
165
166 .gitignore | 2 ++
167 Makefile.am | 2 +-
168 build/autotools/Makefile.am | 1 +
169 build/autotools/as-linguas.m4 | 24 ++++++++++++++++++++++++
170 configure.ac | 12 ++++++++++++
171 json-glib/json-gobject.c | 2 ++
172 json-glib/json-gvariant.c | 6 ++++++
173 json-glib/json-parser.c | 2 ++
174 json-glib/json-path.c | 4 +++-
175 json-glib/json-reader.c | 2 ++
176 po/.gitignore | 13 +++++++++++++
177 po/Makevars | 7 +++++++
178 po/POTFILES.in | 6 ++++++
179 13 files changed, 81 insertions(+), 2 deletions(-)
180
181commit e3b5883d4435da7fe677eb9a7c74d2f83980f5da
182Author: Emmanuele Bassi <ebassi@linux.intel.com>
183Date: Wed Jun 1 12:49:28 2011 +0100
184
185 gobject: Do not serialize default values
186
187 If a property is set to its default value then we can skip its
188 serialization, to keep the number of JSON object members down.
189
190 json-glib/json-gobject.c | 7 +++++++
191 1 files changed, 7 insertions(+), 0 deletions(-)
192
193commit 8c424cc133575282371bff8d17295662267049e9
194Author: Emmanuele Bassi <ebassi@linux.intel.com>
195Date: Wed Jun 1 12:48:20 2011 +0100
196
197 tests/serialize-complex: Modify the instance
198
199 Do not test the defaults: create the GObject instance with different
200 values than the default ones from the GParamSpec.
201
202 json-glib/tests/serialize-complex.c | 22 +++++++++++-----------
203 1 files changed, 11 insertions(+), 11 deletions(-)
204
205commit 96b1e6b50f355c04e794ad7366bd33b9c3d1f81b
206Author: Emmanuele Bassi <ebassi@linux.intel.com>
207Date: Wed Jun 1 12:35:58 2011 +0100
208
209 serializable: Allow introspecting properties
210
211 This allows a Serializable implementation to override the property list,
212 and the setter and the getter function.
213
214 json-glib/json-gobject.c | 43 +++++++++++++++++-----
215 json-glib/json-gobject.h | 22 +++++++++++
216 json-glib/json-serializable.c | 81 +++++++++++++++++++++++++++++++++++++++++
217 3 files changed, 137 insertions(+), 9 deletions(-)
218
219commit c85fc93f6235b8b9d584585215b2fa860f07f2c3
220Author: Emmanuele Bassi <ebassi@linux.intel.com>
221Date: Wed Jun 1 12:36:08 2011 +0100
222
223 Revert "path: Add some more validation points"
224
225 This reverts commit e8fa85705e48d03742eb351addbad53be4d8e60b.
226
227 The validation broke the test suite; it'll need some more work.
228
229 json-glib/json-path.c | 77 +++++++++++++-----------------------------------
230 1 files changed, 21 insertions(+), 56 deletions(-)
231
232commit e8fa85705e48d03742eb351addbad53be4d8e60b
233Author: Emmanuele Bassi <ebassi@linux.intel.com>
234Date: Wed Jun 1 07:55:17 2011 +0100
235
236 path: Add some more validation points
237
238 Especially for the slice syntax.
239
240 json-glib/json-path.c | 77 +++++++++++++++++++++++++++++++++++-------------
241 1 files changed, 56 insertions(+), 21 deletions(-)
242
243commit 295c469329d040b4d311e9c295bec908856190d6
244Author: Emmanuele Bassi <ebassi@linux.intel.com>
245Date: Wed Jun 1 07:54:48 2011 +0100
246
247 symbols: Add JsonPath public entry points
248
249 json-glib/json-glib.symbols | 6 ++++++
250 1 files changed, 6 insertions(+), 0 deletions(-)
251
252commit 257209ab47ebcbf36006dd3aa3fcee5545381c6f
253Author: Emmanuele Bassi <ebassi@linux.intel.com>
254Date: Wed Jun 1 07:54:26 2011 +0100
255
256 docs: Document JsonPath and add it to the API reference
257
258 doc/reference/json-glib-docs.xml | 3 +-
259 doc/reference/json-glib-sections.txt | 20 ++++
260 doc/reference/json-glib.types | 1 +
261 json-glib/json-path.c | 174 +++++++++++++++++++++++++++++++++-
262 4 files changed, 195 insertions(+), 3 deletions(-)
263
264commit ac89bb7fc7491019f8baa687a785eeb93af7213e
265Merge: b5bd477 4ea8cd4
266Author: Emmanuele Bassi <ebassi@linux.intel.com>
267Date: Tue May 31 23:16:10 2011 +0100
268
269 Merge branch 'wip/json-path'
270
271 * wip/json-path:
272 Add initial JSONPath implementation
273
274commit 4ea8cd43986d5888fb8e809a198d6b0331b12480
275Author: Emmanuele Bassi <ebassi@gnome.org>
276Date: Sat May 28 14:36:43 2011 +0100
277
278 Add initial JSONPath implementation
279
280 JSONPath is a JSON query syntax similar to what XPath does for XML;
281 using JSONPath it's possible to address a specific node (or set of
282 nodes) inside a JSON document.
283
284 The JsonPath class is a simple implementation of part of the JSONPath
285 proposal, as formalised by Stefan Gössner here:
286
287 http://goessner.net/articles/JsonPath/
288
289 The covered operators are:
290
291 • root, or '$';
292 • child, both using the dot-notation and the bracket notation;
293 • recursive descent, or '..';
294 • subscript, or '[]';
295 • set, or '[,]';
296 • slice, or '[start:end:step]'.
297
298 The only missing operators are the filter, or '?()' and the script,
299 or '()', because implementing a JavaScript interpreter inside JSON-GLib
300 is not one of my greatest aspirations. It should be possible, though,
301 to parse and evaluate simple arithmetic conditions, in the future.
302
303 The JsonPath methods are pretty straightforward: a JsonPath instance
304 should be created and used to compile an expression; the compilation
305 might result in a syntax error or not. Then, the JsonPath instance can
306 be used to match any JSON tree. Like the other JSONPath implementations,
307 JsonPath returns a JSON array of matching nodes.
308
309 A simple, one-off static method called json_path_query() is also
310 provided; the method wraps the JsonPath creation, the expression
311 compilation, and the matching, as well as disposing the JsonPath
312 instance once done.
313
314 For the time being, only positive testing is provided; negative testing
315 for the expression compilation will follow.
316
317 json-glib/Makefile.am | 2 +
318 json-glib/json-debug.c | 3 +-
319 json-glib/json-debug.h | 3 +-
320 json-glib/json-glib.h | 1 +
321 json-glib/json-path.c | 856 +++++++++++++++++++++++++++++++++++++++++++
322 json-glib/json-path.h | 97 +++++
323 json-glib/tests/Makefile.am | 1 +
324 json-glib/tests/path-test.c | 143 +++++++
325 8 files changed, 1104 insertions(+), 2 deletions(-)
326
327commit b5bd47727c960990ba98902ee2d7099491a4178a
328Author: Chun-wei Fan <fanchunwei@src.gnome.org>
329Date: Mon May 30 14:26:54 2011 +0800
330
331 Add/update Visual C++ projects for GVariant API
332
333 -Added/dist VS 2008/2010 projects to compile the gvariant-test test program
334 (yes, the gvariant-test program passes in the 32-bit and 64-bit modes)
335 -Updated property sheet to "install" the "new" json-gvariant.h
336
337 build/win32/vs10/Makefile.am | 2 +
338 build/win32/vs10/gvariant-test.vcxproj | 159 ++++++++++++++++++++++++
339 build/win32/vs10/gvariant-test.vcxproj.filters | 14 ++
340 build/win32/vs10/json-glib.props | 2 +
341 build/win32/vs10/json-glib.sln | 10 ++
342 build/win32/vs9/Makefile.am | 1 +
343 build/win32/vs9/gvariant-test.vcproj | 147 ++++++++++++++++++++++
344 build/win32/vs9/json-glib.sln | 14 ++
345 build/win32/vs9/json-glib.vsprops | 1 +
346 9 files changed, 350 insertions(+), 0 deletions(-)
347
348commit 3a1d817fd39b4b4d2bdbc93257be535c5b29780f
349Author: Chun-wei Fan <fanchunwei@src.gnome.org>
350Date: Mon May 30 13:07:53 2011 +0800
351
352 Update json-glib.symbols
353
354 Added the JSON-GLib gvariant-related APIs.
355
356 json-glib/json-glib.symbols | 4 ++++
357 1 files changed, 4 insertions(+), 0 deletions(-)
358
359commit 1b7f20fe88a6647e61964db063eba071114a6f66
360Author: Chun-wei Fan <fanchunwei@src.gnome.org>
361Date: Mon May 30 12:53:47 2011 +0800
362
363 Update $(srcroot)/Makefile.am
364
365 Due to changes to this file in commit
366 4e41d26586991d2977c846fa4871b6df39fe4106, change the order of SUBDIRS
367 so that "make dist" will properly run.
368
369 This has been checked with "make distcheck" on Fedora 15
370
371 Makefile.am | 2 +-
372 1 files changed, 1 insertions(+), 1 deletions(-)
373
374commit 54172e25e8b62075f0aef98d21e17619466ff30f
375Author: Chun-wei Fan <fanchunwei@src.gnome.org>
376Date: Mon May 30 11:55:06 2011 +0800
377
378 Update Visual C++ Project Files
379
380 Update the dist part too...
381
382 build/win32/vs10/Makefile.am | 16 ++++++++--------
383 build/win32/vs9/Makefile.am | 8 ++++----
384 2 files changed, 12 insertions(+), 12 deletions(-)
385
386commit 0715050a5a76f187f66f14288a8f3444a4eb49e4
387Author: Chun-wei Fan <fanchunwei@src.gnome.org>
388Date: Mon May 30 11:53:04 2011 +0800
389
390 Update VS 2008/2010 Project Files
391
392 Due to the changes in the location/names of some test programs in
393 commit 4e41d26586991d2977c846fa4871b6df39fe4106, update the VS
394 project files...
395
396 build/win32/vs10/boxed.vcxproj | 172 ++++++++++++++++++++
397 build/win32/vs10/boxed.vcxproj.filters | 14 ++
398 build/win32/vs10/install.vcxproj | 8 +-
399 build/win32/vs10/json-glib.sln | 8 +-
400 build/win32/vs10/serialize-complex.vcxproj | 171 +++++++++++++++++++
401 build/win32/vs10/serialize-complex.vcxproj.filters | 14 ++
402 build/win32/vs10/serialize-full.vcxproj | 172 ++++++++++++++++++++
403 build/win32/vs10/serialize-full.vcxproj.filters | 14 ++
404 build/win32/vs10/serialize-simple.vcxproj | 171 +++++++++++++++++++
405 build/win32/vs10/serialize-simple.vcxproj.filters | 14 ++
406 build/win32/vs10/test-serialize-boxed.vcxproj | 172 --------------------
407 .../vs10/test-serialize-boxed.vcxproj.filters | 14 --
408 build/win32/vs10/test-serialize-complex.vcxproj | 171 -------------------
409 .../vs10/test-serialize-complex.vcxproj.filters | 14 --
410 build/win32/vs10/test-serialize-full.vcxproj | 172 --------------------
411 .../win32/vs10/test-serialize-full.vcxproj.filters | 14 --
412 build/win32/vs10/test-serialize-simple.vcxproj | 171 -------------------
413 .../vs10/test-serialize-simple.vcxproj.filters | 14 --
414 build/win32/vs9/boxed.vcproj | 157 ++++++++++++++++++
415 build/win32/vs9/json-glib.sln | 8 +-
416 build/win32/vs9/serialize-complex.vcproj | 156 ++++++++++++++++++
417 build/win32/vs9/serialize-full.vcproj | 157 ++++++++++++++++++
418 build/win32/vs9/serialize-simple.vcproj | 156 ++++++++++++++++++
419 build/win32/vs9/test-serialize-boxed.vcproj | 157 ------------------
420 build/win32/vs9/test-serialize-complex.vcproj | 156 ------------------
421 build/win32/vs9/test-serialize-full.vcproj | 157 ------------------
422 build/win32/vs9/test-serialize-simple.vcproj | 156 ------------------
423 27 files changed, 1380 insertions(+), 1380 deletions(-)
424
425commit 8b778252358ddb28936c6c9192a84f76368ca122
426Author: Emmanuele Bassi <ebassi@gnome.org>
427Date: Sat May 28 11:38:18 2011 +0100
428
429 tests: Fix up the JsonBuilder test
430
431 Clean up some odd code, and add a unit for the empty object case outlined
432 in bug 651271.
433
434 json-glib/tests/builder-test.c | 52 +++++++++++++++++++++++++++++++++++----
435 1 files changed, 46 insertions(+), 6 deletions(-)
436
437commit d784cc6825607c517d7565049108d1f908a1d71b
438Author: Emmanuele Bassi <ebassi@gnome.org>
439Date: Sat May 28 11:36:55 2011 +0100
440
441 builder: Initialize state fields
442
443 If we're calling g_free() on a field we better make sure that it's either
444 NULL or contains valid data.
445
446 https://bugzilla.gnome.org/show_bug.cgi?id=651271
447
448 json-glib/json-builder.c | 1 +
449 1 files changed, 1 insertions(+), 0 deletions(-)
450
451commit e20a8b0faeb45d1ae2f1bd12d49d31d12e357b24
452Author: Alexandre Mazari <scaroo@gmail.com>
453Date: Tue Mar 22 17:28:55 2011 +0100
454
455 gvariant: Fix introspection annotation
456
457 The 'signature' arguments of the json_gvariant_deserialize functions are
458 optional.
459
460 Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
461
462 json-glib/json-gvariant.c | 4 ++--
463 1 files changed, 2 insertions(+), 2 deletions(-)
464
465commit 4e41d26586991d2977c846fa4871b6df39fe4106
466Author: Emmanuele Bassi <ebassi@gnome.org>
467Date: Sat May 28 11:05:57 2011 +0100
468
469 tests: Move all tests under json-glib
470
471 The test framework should live under the json-glib directory, and not be
472 spread across the project.
473
474 Makefile.am | 6 -
475 configure.ac | 2 -
476 json-glib/tests/Makefile.am | 53 ++---
477 json-glib/tests/boxed.c | 264 +++++++++++++++++++++++
478 json-glib/tests/serialize-complex.c | 293 +++++++++++++++++++++++++
479 json-glib/tests/serialize-full.c | 402 +++++++++++++++++++++++++++++++++++
480 json-glib/tests/serialize-simple.c | 166 ++++++++++++++
481 tests/Makefile.am | 34 ---
482 tests/test-serialize-boxed.c | 264 -----------------------
483 tests/test-serialize-complex.c | 293 -------------------------
484 tests/test-serialize-full.c | 402 -----------------------------------
485 tests/test-serialize-simple.c | 166 --------------
486 12 files changed, 1142 insertions(+), 1203 deletions(-)
487
488commit 8d98b99b945423085232d358492e97399c9fd071
489Author: Chun-wei Fan <fanchunwei@src.gnome.org>
490Date: Mon May 23 09:39:20 2011 +0800
491
492 Update Visual Studio property sheets
493
494 -Make DLL/LIB versioning more like the autotools-compiled versions
495 -"Install" the headers in a more consistent way like the autotools versions
496
497 build/win32/vs10/json-glib.props | 26 +++++++++++++-------------
498 build/win32/vs9/json-glib.vsprops | 32 ++++++++++++++++----------------
499 2 files changed, 29 insertions(+), 29 deletions(-)
500
501commit 15221448b5998a071b72299c666044dd65ea97e3
502Author: Emmanuele Bassi <ebassi@linux.intel.com>
503Date: Thu May 19 08:32:03 2011 +0100
504
505 Add ignore file under build/win32
506
507 build/win32/.gitignore | 4 ++++
508 1 files changed, 4 insertions(+), 0 deletions(-)
509
510commit f4651885961bf3ccc8d475cdc86af051fe1101f6
511Author: Emmanuele Bassi <ebassi@linux.intel.com>
512Date: Wed May 18 13:44:07 2011 +0100
513
514 doap: Add the download-page resource
515
516 json-glib.doap | 2 ++
517 1 files changed, 2 insertions(+), 0 deletions(-)
518
519commit 8ef7da62a7575ebb04c69b9d98fd24efb840ab3b
520Author: Emmanuele Bassi <ebassi@linux.intel.com>
521Date: Wed May 18 13:39:38 2011 +0100
522
523 Post-release version bump to 0.13.3
524
525 configure.ac | 2 +-
526 1 files changed, 1 insertions(+), 1 deletions(-)
527
1commit aa793a4fbcc4d44d367ba84d3782823885fec045528commit aa793a4fbcc4d44d367ba84d3782823885fec045
2Author: Emmanuele Bassi <ebassi@linux.intel.com>529Author: Emmanuele Bassi <ebassi@linux.intel.com>
3Date: Wed May 18 13:37:38 2011 +0100530Date: Wed May 18 13:37:38 2011 +0100
4531
=== removed file 'INSTALL'
--- INSTALL 2010-05-28 11:49:23 +0000
+++ INSTALL 1970-01-01 00:00:00 +0000
@@ -1,365 +0,0 @@
1Installation Instructions
2*************************
3
4Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
52006, 2007, 2008, 2009 Free Software Foundation, Inc.
6
7 Copying and distribution of this file, with or without modification,
8are permitted in any medium without royalty provided the copyright
9notice and this notice are preserved. This file is offered as-is,
10without warranty of any kind.
11
12Basic Installation
13==================
14
15 Briefly, the shell commands `./configure; make; make install' should
16configure, build, and install this package. The following
17more-detailed instructions are generic; see the `README' file for
18instructions specific to this package. Some packages provide this
19`INSTALL' file but do not implement all of the features documented
20below. The lack of an optional feature in a given package is not
21necessarily a bug. More recommendations for GNU packages can be found
22in *note Makefile Conventions: (standards)Makefile Conventions.
23
24 The `configure' shell script attempts to guess correct values for
25various system-dependent variables used during compilation. It uses
26those values to create a `Makefile' in each directory of the package.
27It may also create one or more `.h' files containing system-dependent
28definitions. Finally, it creates a shell script `config.status' that
29you can run in the future to recreate the current configuration, and a
30file `config.log' containing compiler output (useful mainly for
31debugging `configure').
32
33 It can also use an optional file (typically called `config.cache'
34and enabled with `--cache-file=config.cache' or simply `-C') that saves
35the results of its tests to speed up reconfiguring. Caching is
36disabled by default to prevent problems with accidental use of stale
37cache files.
38
39 If you need to do unusual things to compile the package, please try
40to figure out how `configure' could check whether to do them, and mail
41diffs or instructions to the address given in the `README' so they can
42be considered for the next release. If you are using the cache, and at
43some point `config.cache' contains results you don't want to keep, you
44may remove or edit it.
45
46 The file `configure.ac' (or `configure.in') is used to create
47`configure' by a program called `autoconf'. You need `configure.ac' if
48you want to change it or regenerate `configure' using a newer version
49of `autoconf'.
50
51 The simplest way to compile this package is:
52
53 1. `cd' to the directory containing the package's source code and type
54 `./configure' to configure the package for your system.
55
56 Running `configure' might take a while. While running, it prints
57 some messages telling which features it is checking for.
58
59 2. Type `make' to compile the package.
60
61 3. Optionally, type `make check' to run any self-tests that come with
62 the package, generally using the just-built uninstalled binaries.
63
64 4. Type `make install' to install the programs and any data files and
65 documentation. When installing into a prefix owned by root, it is
66 recommended that the package be configured and built as a regular
67 user, and only the `make install' phase executed with root
68 privileges.
69
70 5. Optionally, type `make installcheck' to repeat any self-tests, but
71 this time using the binaries in their final installed location.
72 This target does not install anything. Running this target as a
73 regular user, particularly if the prior `make install' required
74 root privileges, verifies that the installation completed
75 correctly.
76
77 6. You can remove the program binaries and object files from the
78 source code directory by typing `make clean'. To also remove the
79 files that `configure' created (so you can compile the package for
80 a different kind of computer), type `make distclean'. There is
81 also a `make maintainer-clean' target, but that is intended mainly
82 for the package's developers. If you use it, you may have to get
83 all sorts of other programs in order to regenerate files that came
84 with the distribution.
85
86 7. Often, you can also type `make uninstall' to remove the installed
87 files again. In practice, not all packages have tested that
88 uninstallation works correctly, even though it is required by the
89 GNU Coding Standards.
90
91 8. Some packages, particularly those that use Automake, provide `make
92 distcheck', which can by used by developers to test that all other
93 targets like `make install' and `make uninstall' work correctly.
94 This target is generally not run by end users.
95
96Compilers and Options
97=====================
98
99 Some systems require unusual options for compilation or linking that
100the `configure' script does not know about. Run `./configure --help'
101for details on some of the pertinent environment variables.
102
103 You can give `configure' initial values for configuration parameters
104by setting variables in the command line or in the environment. Here
105is an example:
106
107 ./configure CC=c99 CFLAGS=-g LIBS=-lposix
108
109 *Note Defining Variables::, for more details.
110
111Compiling For Multiple Architectures
112====================================
113
114 You can compile the package for more than one kind of computer at the
115same time, by placing the object files for each architecture in their
116own directory. To do this, you can use GNU `make'. `cd' to the
117directory where you want the object files and executables to go and run
118the `configure' script. `configure' automatically checks for the
119source code in the directory that `configure' is in and in `..'. This
120is known as a "VPATH" build.
121
122 With a non-GNU `make', it is safer to compile the package for one
123architecture at a time in the source code directory. After you have
124installed the package for one architecture, use `make distclean' before
125reconfiguring for another architecture.
126
127 On MacOS X 10.5 and later systems, you can create libraries and
128executables that work on multiple system types--known as "fat" or
129"universal" binaries--by specifying multiple `-arch' options to the
130compiler but only a single `-arch' option to the preprocessor. Like
131this:
132
133 ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
134 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
135 CPP="gcc -E" CXXCPP="g++ -E"
136
137 This is not guaranteed to produce working output in all cases, you
138may have to build one architecture at a time and combine the results
139using the `lipo' tool if you have problems.
140
141Installation Names
142==================
143
144 By default, `make install' installs the package's commands under
145`/usr/local/bin', include files under `/usr/local/include', etc. You
146can specify an installation prefix other than `/usr/local' by giving
147`configure' the option `--prefix=PREFIX', where PREFIX must be an
148absolute file name.
149
150 You can specify separate installation prefixes for
151architecture-specific files and architecture-independent files. If you
152pass the option `--exec-prefix=PREFIX' to `configure', the package uses
153PREFIX as the prefix for installing programs and libraries.
154Documentation and other data files still use the regular prefix.
155
156 In addition, if you use an unusual directory layout you can give
157options like `--bindir=DIR' to specify different values for particular
158kinds of files. Run `configure --help' for a list of the directories
159you can set and what kinds of files go in them. In general, the
160default for these options is expressed in terms of `${prefix}', so that
161specifying just `--prefix' will affect all of the other directory
162specifications that were not explicitly provided.
163
164 The most portable way to affect installation locations is to pass the
165correct locations to `configure'; however, many packages provide one or
166both of the following shortcuts of passing variable assignments to the
167`make install' command line to change installation locations without
168having to reconfigure or recompile.
169
170 The first method involves providing an override variable for each
171affected directory. For example, `make install
172prefix=/alternate/directory' will choose an alternate location for all
173directory configuration variables that were expressed in terms of
174`${prefix}'. Any directories that were specified during `configure',
175but not in terms of `${prefix}', must each be overridden at install
176time for the entire installation to be relocated. The approach of
177makefile variable overrides for each directory variable is required by
178the GNU Coding Standards, and ideally causes no recompilation.
179However, some platforms have known limitations with the semantics of
180shared libraries that end up requiring recompilation when using this
181method, particularly noticeable in packages that use GNU Libtool.
182
183 The second method involves providing the `DESTDIR' variable. For
184example, `make install DESTDIR=/alternate/directory' will prepend
185`/alternate/directory' before all installation names. The approach of
186`DESTDIR' overrides is not required by the GNU Coding Standards, and
187does not work on platforms that have drive letters. On the other hand,
188it does better at avoiding recompilation issues, and works well even
189when some directory options were not specified in terms of `${prefix}'
190at `configure' time.
191
192Optional Features
193=================
194
195 If the package supports it, you can cause programs to be installed
196with an extra prefix or suffix on their names by giving `configure' the
197option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
198
199 Some packages pay attention to `--enable-FEATURE' options to
200`configure', where FEATURE indicates an optional part of the package.
201They may also pay attention to `--with-PACKAGE' options, where PACKAGE
202is something like `gnu-as' or `x' (for the X Window System). The
203`README' should mention any `--enable-' and `--with-' options that the
204package recognizes.
205
206 For packages that use the X Window System, `configure' can usually
207find the X include and library files automatically, but if it doesn't,
208you can use the `configure' options `--x-includes=DIR' and
209`--x-libraries=DIR' to specify their locations.
210
211 Some packages offer the ability to configure how verbose the
212execution of `make' will be. For these packages, running `./configure
213--enable-silent-rules' sets the default to minimal output, which can be
214overridden with `make V=1'; while running `./configure
215--disable-silent-rules' sets the default to verbose, which can be
216overridden with `make V=0'.
217
218Particular systems
219==================
220
221 On HP-UX, the default C compiler is not ANSI C compatible. If GNU
222CC is not installed, it is recommended to use the following options in
223order to use an ANSI C compiler:
224
225 ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
226
227and if that doesn't work, install pre-built binaries of GCC for HP-UX.
228
229 On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
230parse its `<wchar.h>' header file. The option `-nodtk' can be used as
231a workaround. If GNU CC is not installed, it is therefore recommended
232to try
233
234 ./configure CC="cc"
235
236and if that doesn't work, try
237
238 ./configure CC="cc -nodtk"
239
240 On Solaris, don't put `/usr/ucb' early in your `PATH'. This
241directory contains several dysfunctional programs; working variants of
242these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
243in your `PATH', put it _after_ `/usr/bin'.
244
245 On Haiku, software installed for all users goes in `/boot/common',
246not `/usr/local'. It is recommended to use the following options:
247
248 ./configure --prefix=/boot/common
249
250Specifying the System Type
251==========================
252
253 There may be some features `configure' cannot figure out
254automatically, but needs to determine by the type of machine the package
255will run on. Usually, assuming the package is built to be run on the
256_same_ architectures, `configure' can figure that out, but if it prints
257a message saying it cannot guess the machine type, give it the
258`--build=TYPE' option. TYPE can either be a short name for the system
259type, such as `sun4', or a canonical name which has the form:
260
261 CPU-COMPANY-SYSTEM
262
263where SYSTEM can have one of these forms:
264
265 OS
266 KERNEL-OS
267
268 See the file `config.sub' for the possible values of each field. If
269`config.sub' isn't included in this package, then this package doesn't
270need to know the machine type.
271
272 If you are _building_ compiler tools for cross-compiling, you should
273use the option `--target=TYPE' to select the type of system they will
274produce code for.
275
276 If you want to _use_ a cross compiler, that generates code for a
277platform different from the build platform, you should specify the
278"host" platform (i.e., that on which the generated programs will
279eventually be run) with `--host=TYPE'.
280
281Sharing Defaults
282================
283
284 If you want to set default values for `configure' scripts to share,
285you can create a site shell script called `config.site' that gives
286default values for variables like `CC', `cache_file', and `prefix'.
287`configure' looks for `PREFIX/share/config.site' if it exists, then
288`PREFIX/etc/config.site' if it exists. Or, you can set the
289`CONFIG_SITE' environment variable to the location of the site script.
290A warning: not all `configure' scripts look for a site script.
291
292Defining Variables
293==================
294
295 Variables not defined in a site shell script can be set in the
296environment passed to `configure'. However, some packages may run
297configure again during the build, and the customized values of these
298variables may be lost. In order to avoid this problem, you should set
299them in the `configure' command line, using `VAR=value'. For example:
300
301 ./configure CC=/usr/local2/bin/gcc
302
303causes the specified `gcc' to be used as the C compiler (unless it is
304overridden in the site shell script).
305
306Unfortunately, this technique does not work for `CONFIG_SHELL' due to
307an Autoconf bug. Until the bug is fixed you can use this workaround:
308
309 CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
310
311`configure' Invocation
312======================
313
314 `configure' recognizes the following options to control how it
315operates.
316
317`--help'
318`-h'
319 Print a summary of all of the options to `configure', and exit.
320
321`--help=short'
322`--help=recursive'
323 Print a summary of the options unique to this package's
324 `configure', and exit. The `short' variant lists options used
325 only in the top level, while the `recursive' variant lists options
326 also present in any nested packages.
327
328`--version'
329`-V'
330 Print the version of Autoconf used to generate the `configure'
331 script, and exit.
332
333`--cache-file=FILE'
334 Enable the cache: use and save the results of the tests in FILE,
335 traditionally `config.cache'. FILE defaults to `/dev/null' to
336 disable caching.
337
338`--config-cache'
339`-C'
340 Alias for `--cache-file=config.cache'.
341
342`--quiet'
343`--silent'
344`-q'
345 Do not print messages saying which checks are being made. To
346 suppress all normal output, redirect it to `/dev/null' (any error
347 messages will still be shown).
348
349`--srcdir=DIR'
350 Look for the package's source code in directory DIR. Usually
351 `configure' can determine that directory automatically.
352
353`--prefix=DIR'
354 Use DIR as the installation prefix. *note Installation Names::
355 for more details, including other options available for fine-tuning
356 the installation locations.
357
358`--no-create'
359`-n'
360 Run the configure checks, but stop before creating any output
361 files.
362
363`configure' also accepts some other, not widely useful, options. Run
364`configure --help' for more details.
365
3660
=== modified file 'Makefile.am'
--- Makefile.am 2011-05-18 15:01:29 +0000
+++ Makefile.am 2011-06-20 20:11:46 +0000
@@ -3,13 +3,7 @@
33
4ACLOCAL_AMFLAGS = -I build/autotools4ACLOCAL_AMFLAGS = -I build/autotools
55
6SUBDIRS = build json-glib doc6SUBDIRS = json-glib doc build po
7
8if ENABLE_GLIB_TEST
9SUBDIRS += tests
10endif
11
12DIST_SUBDIRS = json-glib doc tests build
137
14pcfiles = json-glib-1.0.pc8pcfiles = json-glib-1.0.pc
159
1610
=== modified file 'Makefile.in'
--- Makefile.in 2011-05-18 15:01:29 +0000
+++ Makefile.in 2011-06-20 20:11:46 +0000
@@ -43,21 +43,30 @@
43 $(srcdir)/json-glib.pc.in \43 $(srcdir)/json-glib.pc.in \
44 $(top_srcdir)/build/autotools/Makefile.am.gtest \44 $(top_srcdir)/build/autotools/Makefile.am.gtest \
45 $(top_srcdir)/build/autotools/Makefile.am.silent \45 $(top_srcdir)/build/autotools/Makefile.am.silent \
46 $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \46 $(top_srcdir)/configure ABOUT-NLS COPYING NEWS compile \
47 compile config.guess config.sub depcomp install-sh ltmain.sh \47 config.guess config.rpath config.sub depcomp install-sh \
48 missing48 ltmain.sh missing
49@ENABLE_GLIB_TEST_TRUE@am__append_1 = tests
50subdir = .49subdir = .
51ACLOCAL_M4 = $(top_srcdir)/aclocal.m450ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
52am__aclocal_m4_deps = \51am__aclocal_m4_deps = \
53 $(top_srcdir)/build/autotools/as-compiler-flag.m4 \52 $(top_srcdir)/build/autotools/as-compiler-flag.m4 \
53 $(top_srcdir)/build/autotools/as-linguas.m4 \
54 $(top_srcdir)/build/autotools/gettext.m4 \
54 $(top_srcdir)/build/autotools/gtk-doc.m4 \55 $(top_srcdir)/build/autotools/gtk-doc.m4 \
56 $(top_srcdir)/build/autotools/iconv.m4 \
57 $(top_srcdir)/build/autotools/intlmacosx.m4 \
55 $(top_srcdir)/build/autotools/introspection.m4 \58 $(top_srcdir)/build/autotools/introspection.m4 \
59 $(top_srcdir)/build/autotools/lib-ld.m4 \
60 $(top_srcdir)/build/autotools/lib-link.m4 \
61 $(top_srcdir)/build/autotools/lib-prefix.m4 \
56 $(top_srcdir)/build/autotools/libtool.m4 \62 $(top_srcdir)/build/autotools/libtool.m4 \
57 $(top_srcdir)/build/autotools/ltoptions.m4 \63 $(top_srcdir)/build/autotools/ltoptions.m4 \
58 $(top_srcdir)/build/autotools/ltsugar.m4 \64 $(top_srcdir)/build/autotools/ltsugar.m4 \
59 $(top_srcdir)/build/autotools/ltversion.m4 \65 $(top_srcdir)/build/autotools/ltversion.m4 \
60 $(top_srcdir)/build/autotools/lt~obsolete.m4 \66 $(top_srcdir)/build/autotools/lt~obsolete.m4 \
67 $(top_srcdir)/build/autotools/nls.m4 \
68 $(top_srcdir)/build/autotools/po.m4 \
69 $(top_srcdir)/build/autotools/progtest.m4 \
61 $(top_srcdir)/configure.ac70 $(top_srcdir)/configure.ac
62am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \71am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
63 $(ACLOCAL_M4)72 $(ACLOCAL_M4)
@@ -112,6 +121,7 @@
112 distdir dist dist-all distcheck121 distdir dist dist-all distcheck
113ETAGS = etags122ETAGS = etags
114CTAGS = ctags123CTAGS = ctags
124DIST_SUBDIRS = $(SUBDIRS)
115DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)125DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
116distdir = $(PACKAGE)-$(VERSION)126distdir = $(PACKAGE)-$(VERSION)
117top_distdir = $(distdir)127top_distdir = $(distdir)
@@ -149,6 +159,7 @@
149distuninstallcheck_listfiles = find . -type f -print159distuninstallcheck_listfiles = find . -type f -print
150distcleancheck_listfiles = find . -type f -print160distcleancheck_listfiles = find . -type f -print
151ACLOCAL = @ACLOCAL@161ACLOCAL = @ACLOCAL@
162ALL_LINGUAS = @ALL_LINGUAS@
152AMTAR = @AMTAR@163AMTAR = @AMTAR@
153AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@164AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
154AR = @AR@165AR = @AR@
@@ -175,11 +186,15 @@
175FGREP = @FGREP@186FGREP = @FGREP@
176GCOV_CFLAGS = @GCOV_CFLAGS@187GCOV_CFLAGS = @GCOV_CFLAGS@
177GCOV_LDFLAGS = @GCOV_LDFLAGS@188GCOV_LDFLAGS = @GCOV_LDFLAGS@
189GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
190GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
178GLIB_CFLAGS = @GLIB_CFLAGS@191GLIB_CFLAGS = @GLIB_CFLAGS@
179GLIB_GENMARSHAL = @GLIB_GENMARSHAL@192GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
180GLIB_LIBS = @GLIB_LIBS@193GLIB_LIBS = @GLIB_LIBS@
181GLIB_MKENUMS = @GLIB_MKENUMS@194GLIB_MKENUMS = @GLIB_MKENUMS@
182GLIB_PREFIX = @GLIB_PREFIX@195GLIB_PREFIX = @GLIB_PREFIX@
196GMSGFMT = @GMSGFMT@
197GMSGFMT_015 = @GMSGFMT_015@
183GOBJECT_QUERY = @GOBJECT_QUERY@198GOBJECT_QUERY = @GOBJECT_QUERY@
184GREP = @GREP@199GREP = @GREP@
185GTKDOC_CHECK = @GTKDOC_CHECK@200GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -191,6 +206,8 @@
191INSTALL_PROGRAM = @INSTALL_PROGRAM@206INSTALL_PROGRAM = @INSTALL_PROGRAM@
192INSTALL_SCRIPT = @INSTALL_SCRIPT@207INSTALL_SCRIPT = @INSTALL_SCRIPT@
193INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@208INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
209INTLLIBS = @INTLLIBS@
210INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
194INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@211INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
195INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@212INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
196INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@213INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
@@ -210,16 +227,23 @@
210JSON_VERSION = @JSON_VERSION@227JSON_VERSION = @JSON_VERSION@
211LD = @LD@228LD = @LD@
212LDFLAGS = @LDFLAGS@229LDFLAGS = @LDFLAGS@
230LIBICONV = @LIBICONV@
231LIBINTL = @LIBINTL@
213LIBOBJS = @LIBOBJS@232LIBOBJS = @LIBOBJS@
214LIBS = @LIBS@233LIBS = @LIBS@
215LIBTOOL = @LIBTOOL@234LIBTOOL = @LIBTOOL@
216LIPO = @LIPO@235LIPO = @LIPO@
217LN_S = @LN_S@236LN_S = @LN_S@
237LTLIBICONV = @LTLIBICONV@
238LTLIBINTL = @LTLIBINTL@
218LTLIBOBJS = @LTLIBOBJS@239LTLIBOBJS = @LTLIBOBJS@
219MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@240MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
220MAKEINFO = @MAKEINFO@241MAKEINFO = @MAKEINFO@
221MANIFEST_TOOL = @MANIFEST_TOOL@242MANIFEST_TOOL = @MANIFEST_TOOL@
222MKDIR_P = @MKDIR_P@243MKDIR_P = @MKDIR_P@
244MSGFMT = @MSGFMT@
245MSGFMT_015 = @MSGFMT_015@
246MSGMERGE = @MSGMERGE@
223NM = @NM@247NM = @NM@
224NMEDIT = @NMEDIT@248NMEDIT = @NMEDIT@
225OBJDUMP = @OBJDUMP@249OBJDUMP = @OBJDUMP@
@@ -237,12 +261,17 @@
237PKG_CONFIG = @PKG_CONFIG@261PKG_CONFIG = @PKG_CONFIG@
238PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@262PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
239PKG_CONFIG_PATH = @PKG_CONFIG_PATH@263PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
264POSUB = @POSUB@
240RANLIB = @RANLIB@265RANLIB = @RANLIB@
241SED = @SED@266SED = @SED@
242SET_MAKE = @SET_MAKE@267SET_MAKE = @SET_MAKE@
243SHELL = @SHELL@268SHELL = @SHELL@
244STRIP = @STRIP@269STRIP = @STRIP@
270USE_NLS = @USE_NLS@
245VERSION = @VERSION@271VERSION = @VERSION@
272XGETTEXT = @XGETTEXT@
273XGETTEXT_015 = @XGETTEXT_015@
274XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
246abs_builddir = @abs_builddir@275abs_builddir = @abs_builddir@
247abs_srcdir = @abs_srcdir@276abs_srcdir = @abs_srcdir@
248abs_top_builddir = @abs_top_builddir@277abs_top_builddir = @abs_top_builddir@
@@ -309,8 +338,7 @@
309QUIET_RM_ = $(QUIET_RM_$(AM_DEFAULT_VERBOSITY))338QUIET_RM_ = $(QUIET_RM_$(AM_DEFAULT_VERBOSITY))
310QUIET_RM_0 = @echo ' RM '$@;339QUIET_RM_0 = @echo ' RM '$@;
311ACLOCAL_AMFLAGS = -I build/autotools340ACLOCAL_AMFLAGS = -I build/autotools
312SUBDIRS = build json-glib doc $(am__append_1)341SUBDIRS = json-glib doc build po
313DIST_SUBDIRS = json-glib doc tests build
314pcfiles = json-glib-1.0.pc342pcfiles = json-glib-1.0.pc
315pkgconfig_DATA = $(pcfiles)343pkgconfig_DATA = $(pcfiles)
316pkgconfigdir = $(libdir)/pkgconfig344pkgconfigdir = $(libdir)/pkgconfig
@@ -326,15 +354,15 @@
326 @for dep in $?; do \354 @for dep in $?; do \
327 case '$(am__configure_deps)' in \355 case '$(am__configure_deps)' in \
328 *$$dep*) \356 *$$dep*) \
329 echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \357 echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
330 $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \358 $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
331 && exit 0; \359 && exit 0; \
332 exit 1;; \360 exit 1;; \
333 esac; \361 esac; \
334 done; \362 done; \
335 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \363 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
336 $(am__cd) $(top_srcdir) && \364 $(am__cd) $(top_srcdir) && \
337 $(AUTOMAKE) --gnu Makefile365 $(AUTOMAKE) --foreign Makefile
338.PRECIOUS: Makefile366.PRECIOUS: Makefile
339Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status367Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
340 @case '$?' in \368 @case '$?' in \
341369
=== modified file 'NEWS'
--- NEWS 2011-05-18 15:01:29 +0000
+++ NEWS 2011-06-20 20:11:46 +0000
@@ -9,6 +9,12 @@
9• Add missing introspection annotations [Luca Bruno]9• Add missing introspection annotations [Luca Bruno]
10• Add JsonReader.list_members()10• Add JsonReader.list_members()
11• Allow using JsonReader.read_element() on JSON objects11• Allow using JsonReader.read_element() on JSON objects
12• Remove all G_CONST_RETURN usage after the deprecation
13• Allow JsonSerializable to override the introspection and
14 modification of properties
15• Add i18n support for GError messages
16• Do not serialize GObject properties that match their default
17 values.
1218
13Overview of changes for 0.12.019Overview of changes for 0.12.0
14==============================20==============================
1521
=== modified file 'aclocal.m4'
--- aclocal.m4 2011-05-18 15:01:29 +0000
+++ aclocal.m4 2011-06-20 20:11:46 +0000
@@ -1382,10 +1382,20 @@
1382])1382])
13831383
1384m4_include([build/autotools/as-compiler-flag.m4])1384m4_include([build/autotools/as-compiler-flag.m4])
1385m4_include([build/autotools/as-linguas.m4])
1386m4_include([build/autotools/gettext.m4])
1385m4_include([build/autotools/gtk-doc.m4])1387m4_include([build/autotools/gtk-doc.m4])
1388m4_include([build/autotools/iconv.m4])
1389m4_include([build/autotools/intlmacosx.m4])
1386m4_include([build/autotools/introspection.m4])1390m4_include([build/autotools/introspection.m4])
1391m4_include([build/autotools/lib-ld.m4])
1392m4_include([build/autotools/lib-link.m4])
1393m4_include([build/autotools/lib-prefix.m4])
1387m4_include([build/autotools/libtool.m4])1394m4_include([build/autotools/libtool.m4])
1388m4_include([build/autotools/ltoptions.m4])1395m4_include([build/autotools/ltoptions.m4])
1389m4_include([build/autotools/ltsugar.m4])1396m4_include([build/autotools/ltsugar.m4])
1390m4_include([build/autotools/ltversion.m4])1397m4_include([build/autotools/ltversion.m4])
1391m4_include([build/autotools/lt~obsolete.m4])1398m4_include([build/autotools/lt~obsolete.m4])
1399m4_include([build/autotools/nls.m4])
1400m4_include([build/autotools/po.m4])
1401m4_include([build/autotools/progtest.m4])
13921402
=== modified file 'build/Makefile.in'
--- build/Makefile.in 2011-05-18 15:01:29 +0000
+++ build/Makefile.in 2011-06-20 20:11:46 +0000
@@ -38,13 +38,23 @@
38ACLOCAL_M4 = $(top_srcdir)/aclocal.m438ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
39am__aclocal_m4_deps = \39am__aclocal_m4_deps = \
40 $(top_srcdir)/build/autotools/as-compiler-flag.m4 \40 $(top_srcdir)/build/autotools/as-compiler-flag.m4 \
41 $(top_srcdir)/build/autotools/as-linguas.m4 \
42 $(top_srcdir)/build/autotools/gettext.m4 \
41 $(top_srcdir)/build/autotools/gtk-doc.m4 \43 $(top_srcdir)/build/autotools/gtk-doc.m4 \
44 $(top_srcdir)/build/autotools/iconv.m4 \
45 $(top_srcdir)/build/autotools/intlmacosx.m4 \
42 $(top_srcdir)/build/autotools/introspection.m4 \46 $(top_srcdir)/build/autotools/introspection.m4 \
47 $(top_srcdir)/build/autotools/lib-ld.m4 \
48 $(top_srcdir)/build/autotools/lib-link.m4 \
49 $(top_srcdir)/build/autotools/lib-prefix.m4 \
43 $(top_srcdir)/build/autotools/libtool.m4 \50 $(top_srcdir)/build/autotools/libtool.m4 \
44 $(top_srcdir)/build/autotools/ltoptions.m4 \51 $(top_srcdir)/build/autotools/ltoptions.m4 \
45 $(top_srcdir)/build/autotools/ltsugar.m4 \52 $(top_srcdir)/build/autotools/ltsugar.m4 \
46 $(top_srcdir)/build/autotools/ltversion.m4 \53 $(top_srcdir)/build/autotools/ltversion.m4 \
47 $(top_srcdir)/build/autotools/lt~obsolete.m4 \54 $(top_srcdir)/build/autotools/lt~obsolete.m4 \
55 $(top_srcdir)/build/autotools/nls.m4 \
56 $(top_srcdir)/build/autotools/po.m4 \
57 $(top_srcdir)/build/autotools/progtest.m4 \
48 $(top_srcdir)/configure.ac58 $(top_srcdir)/configure.ac
49am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \59am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
50 $(ACLOCAL_M4)60 $(ACLOCAL_M4)
@@ -102,6 +112,7 @@
102 done; \112 done; \
103 reldir="$$dir2"113 reldir="$$dir2"
104ACLOCAL = @ACLOCAL@114ACLOCAL = @ACLOCAL@
115ALL_LINGUAS = @ALL_LINGUAS@
105AMTAR = @AMTAR@116AMTAR = @AMTAR@
106AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@117AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
107AR = @AR@118AR = @AR@
@@ -128,11 +139,15 @@
128FGREP = @FGREP@139FGREP = @FGREP@
129GCOV_CFLAGS = @GCOV_CFLAGS@140GCOV_CFLAGS = @GCOV_CFLAGS@
130GCOV_LDFLAGS = @GCOV_LDFLAGS@141GCOV_LDFLAGS = @GCOV_LDFLAGS@
142GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
143GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
131GLIB_CFLAGS = @GLIB_CFLAGS@144GLIB_CFLAGS = @GLIB_CFLAGS@
132GLIB_GENMARSHAL = @GLIB_GENMARSHAL@145GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
133GLIB_LIBS = @GLIB_LIBS@146GLIB_LIBS = @GLIB_LIBS@
134GLIB_MKENUMS = @GLIB_MKENUMS@147GLIB_MKENUMS = @GLIB_MKENUMS@
135GLIB_PREFIX = @GLIB_PREFIX@148GLIB_PREFIX = @GLIB_PREFIX@
149GMSGFMT = @GMSGFMT@
150GMSGFMT_015 = @GMSGFMT_015@
136GOBJECT_QUERY = @GOBJECT_QUERY@151GOBJECT_QUERY = @GOBJECT_QUERY@
137GREP = @GREP@152GREP = @GREP@
138GTKDOC_CHECK = @GTKDOC_CHECK@153GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -144,6 +159,8 @@
144INSTALL_PROGRAM = @INSTALL_PROGRAM@159INSTALL_PROGRAM = @INSTALL_PROGRAM@
145INSTALL_SCRIPT = @INSTALL_SCRIPT@160INSTALL_SCRIPT = @INSTALL_SCRIPT@
146INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@161INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
162INTLLIBS = @INTLLIBS@
163INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
147INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@164INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
148INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@165INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
149INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@166INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
@@ -163,16 +180,23 @@
163JSON_VERSION = @JSON_VERSION@180JSON_VERSION = @JSON_VERSION@
164LD = @LD@181LD = @LD@
165LDFLAGS = @LDFLAGS@182LDFLAGS = @LDFLAGS@
183LIBICONV = @LIBICONV@
184LIBINTL = @LIBINTL@
166LIBOBJS = @LIBOBJS@185LIBOBJS = @LIBOBJS@
167LIBS = @LIBS@186LIBS = @LIBS@
168LIBTOOL = @LIBTOOL@187LIBTOOL = @LIBTOOL@
169LIPO = @LIPO@188LIPO = @LIPO@
170LN_S = @LN_S@189LN_S = @LN_S@
190LTLIBICONV = @LTLIBICONV@
191LTLIBINTL = @LTLIBINTL@
171LTLIBOBJS = @LTLIBOBJS@192LTLIBOBJS = @LTLIBOBJS@
172MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@193MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
173MAKEINFO = @MAKEINFO@194MAKEINFO = @MAKEINFO@
174MANIFEST_TOOL = @MANIFEST_TOOL@195MANIFEST_TOOL = @MANIFEST_TOOL@
175MKDIR_P = @MKDIR_P@196MKDIR_P = @MKDIR_P@
197MSGFMT = @MSGFMT@
198MSGFMT_015 = @MSGFMT_015@
199MSGMERGE = @MSGMERGE@
176NM = @NM@200NM = @NM@
177NMEDIT = @NMEDIT@201NMEDIT = @NMEDIT@
178OBJDUMP = @OBJDUMP@202OBJDUMP = @OBJDUMP@
@@ -190,12 +214,17 @@
190PKG_CONFIG = @PKG_CONFIG@214PKG_CONFIG = @PKG_CONFIG@
191PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@215PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
192PKG_CONFIG_PATH = @PKG_CONFIG_PATH@216PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
217POSUB = @POSUB@
193RANLIB = @RANLIB@218RANLIB = @RANLIB@
194SED = @SED@219SED = @SED@
195SET_MAKE = @SET_MAKE@220SET_MAKE = @SET_MAKE@
196SHELL = @SHELL@221SHELL = @SHELL@
197STRIP = @STRIP@222STRIP = @STRIP@
223USE_NLS = @USE_NLS@
198VERSION = @VERSION@224VERSION = @VERSION@
225XGETTEXT = @XGETTEXT@
226XGETTEXT_015 = @XGETTEXT_015@
227XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
199abs_builddir = @abs_builddir@228abs_builddir = @abs_builddir@
200abs_srcdir = @abs_srcdir@229abs_srcdir = @abs_srcdir@
201abs_top_builddir = @abs_top_builddir@230abs_top_builddir = @abs_top_builddir@
@@ -261,9 +290,9 @@
261 exit 1;; \290 exit 1;; \
262 esac; \291 esac; \
263 done; \292 done; \
264 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu build/Makefile'; \293 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/Makefile'; \
265 $(am__cd) $(top_srcdir) && \294 $(am__cd) $(top_srcdir) && \
266 $(AUTOMAKE) --gnu build/Makefile295 $(AUTOMAKE) --foreign build/Makefile
267.PRECIOUS: Makefile296.PRECIOUS: Makefile
268Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status297Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
269 @case '$?' in \298 @case '$?' in \
270299
=== modified file 'build/autotools/Makefile.am'
--- build/autotools/Makefile.am 2011-05-18 15:01:29 +0000
+++ build/autotools/Makefile.am 2011-06-20 20:11:46 +0000
@@ -1,5 +1,6 @@
1EXTRA_DIST = \1EXTRA_DIST = \
2 as-compiler-flag.m4 \2 as-compiler-flag.m4 \
3 as-linguas.m4 \
3 introspection.m4 \4 introspection.m4 \
4 Makefile.am.silent \5 Makefile.am.silent \
5 Makefile.am.enums \6 Makefile.am.enums \
67
=== modified file 'build/autotools/Makefile.in'
--- build/autotools/Makefile.in 2011-05-18 15:01:29 +0000
+++ build/autotools/Makefile.in 2011-06-20 20:11:46 +0000
@@ -38,13 +38,23 @@
38ACLOCAL_M4 = $(top_srcdir)/aclocal.m438ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
39am__aclocal_m4_deps = \39am__aclocal_m4_deps = \
40 $(top_srcdir)/build/autotools/as-compiler-flag.m4 \40 $(top_srcdir)/build/autotools/as-compiler-flag.m4 \
41 $(top_srcdir)/build/autotools/as-linguas.m4 \
42 $(top_srcdir)/build/autotools/gettext.m4 \
41 $(top_srcdir)/build/autotools/gtk-doc.m4 \43 $(top_srcdir)/build/autotools/gtk-doc.m4 \
44 $(top_srcdir)/build/autotools/iconv.m4 \
45 $(top_srcdir)/build/autotools/intlmacosx.m4 \
42 $(top_srcdir)/build/autotools/introspection.m4 \46 $(top_srcdir)/build/autotools/introspection.m4 \
47 $(top_srcdir)/build/autotools/lib-ld.m4 \
48 $(top_srcdir)/build/autotools/lib-link.m4 \
49 $(top_srcdir)/build/autotools/lib-prefix.m4 \
43 $(top_srcdir)/build/autotools/libtool.m4 \50 $(top_srcdir)/build/autotools/libtool.m4 \
44 $(top_srcdir)/build/autotools/ltoptions.m4 \51 $(top_srcdir)/build/autotools/ltoptions.m4 \
45 $(top_srcdir)/build/autotools/ltsugar.m4 \52 $(top_srcdir)/build/autotools/ltsugar.m4 \
46 $(top_srcdir)/build/autotools/ltversion.m4 \53 $(top_srcdir)/build/autotools/ltversion.m4 \
47 $(top_srcdir)/build/autotools/lt~obsolete.m4 \54 $(top_srcdir)/build/autotools/lt~obsolete.m4 \
55 $(top_srcdir)/build/autotools/nls.m4 \
56 $(top_srcdir)/build/autotools/po.m4 \
57 $(top_srcdir)/build/autotools/progtest.m4 \
48 $(top_srcdir)/configure.ac58 $(top_srcdir)/configure.ac
49am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \59am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
50 $(ACLOCAL_M4)60 $(ACLOCAL_M4)
@@ -62,6 +72,7 @@
62DIST_SOURCES =72DIST_SOURCES =
63DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)73DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
64ACLOCAL = @ACLOCAL@74ACLOCAL = @ACLOCAL@
75ALL_LINGUAS = @ALL_LINGUAS@
65AMTAR = @AMTAR@76AMTAR = @AMTAR@
66AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@77AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
67AR = @AR@78AR = @AR@
@@ -88,11 +99,15 @@
88FGREP = @FGREP@99FGREP = @FGREP@
89GCOV_CFLAGS = @GCOV_CFLAGS@100GCOV_CFLAGS = @GCOV_CFLAGS@
90GCOV_LDFLAGS = @GCOV_LDFLAGS@101GCOV_LDFLAGS = @GCOV_LDFLAGS@
102GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
103GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
91GLIB_CFLAGS = @GLIB_CFLAGS@104GLIB_CFLAGS = @GLIB_CFLAGS@
92GLIB_GENMARSHAL = @GLIB_GENMARSHAL@105GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
93GLIB_LIBS = @GLIB_LIBS@106GLIB_LIBS = @GLIB_LIBS@
94GLIB_MKENUMS = @GLIB_MKENUMS@107GLIB_MKENUMS = @GLIB_MKENUMS@
95GLIB_PREFIX = @GLIB_PREFIX@108GLIB_PREFIX = @GLIB_PREFIX@
109GMSGFMT = @GMSGFMT@
110GMSGFMT_015 = @GMSGFMT_015@
96GOBJECT_QUERY = @GOBJECT_QUERY@111GOBJECT_QUERY = @GOBJECT_QUERY@
97GREP = @GREP@112GREP = @GREP@
98GTKDOC_CHECK = @GTKDOC_CHECK@113GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -104,6 +119,8 @@
104INSTALL_PROGRAM = @INSTALL_PROGRAM@119INSTALL_PROGRAM = @INSTALL_PROGRAM@
105INSTALL_SCRIPT = @INSTALL_SCRIPT@120INSTALL_SCRIPT = @INSTALL_SCRIPT@
106INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@121INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
122INTLLIBS = @INTLLIBS@
123INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
107INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@124INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
108INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@125INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
109INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@126INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
@@ -123,16 +140,23 @@
123JSON_VERSION = @JSON_VERSION@140JSON_VERSION = @JSON_VERSION@
124LD = @LD@141LD = @LD@
125LDFLAGS = @LDFLAGS@142LDFLAGS = @LDFLAGS@
143LIBICONV = @LIBICONV@
144LIBINTL = @LIBINTL@
126LIBOBJS = @LIBOBJS@145LIBOBJS = @LIBOBJS@
127LIBS = @LIBS@146LIBS = @LIBS@
128LIBTOOL = @LIBTOOL@147LIBTOOL = @LIBTOOL@
129LIPO = @LIPO@148LIPO = @LIPO@
130LN_S = @LN_S@149LN_S = @LN_S@
150LTLIBICONV = @LTLIBICONV@
151LTLIBINTL = @LTLIBINTL@
131LTLIBOBJS = @LTLIBOBJS@152LTLIBOBJS = @LTLIBOBJS@
132MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@153MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
133MAKEINFO = @MAKEINFO@154MAKEINFO = @MAKEINFO@
134MANIFEST_TOOL = @MANIFEST_TOOL@155MANIFEST_TOOL = @MANIFEST_TOOL@
135MKDIR_P = @MKDIR_P@156MKDIR_P = @MKDIR_P@
157MSGFMT = @MSGFMT@
158MSGFMT_015 = @MSGFMT_015@
159MSGMERGE = @MSGMERGE@
136NM = @NM@160NM = @NM@
137NMEDIT = @NMEDIT@161NMEDIT = @NMEDIT@
138OBJDUMP = @OBJDUMP@162OBJDUMP = @OBJDUMP@
@@ -150,12 +174,17 @@
150PKG_CONFIG = @PKG_CONFIG@174PKG_CONFIG = @PKG_CONFIG@
151PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@175PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
152PKG_CONFIG_PATH = @PKG_CONFIG_PATH@176PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
177POSUB = @POSUB@
153RANLIB = @RANLIB@178RANLIB = @RANLIB@
154SED = @SED@179SED = @SED@
155SET_MAKE = @SET_MAKE@180SET_MAKE = @SET_MAKE@
156SHELL = @SHELL@181SHELL = @SHELL@
157STRIP = @STRIP@182STRIP = @STRIP@
183USE_NLS = @USE_NLS@
158VERSION = @VERSION@184VERSION = @VERSION@
185XGETTEXT = @XGETTEXT@
186XGETTEXT_015 = @XGETTEXT_015@
187XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
159abs_builddir = @abs_builddir@188abs_builddir = @abs_builddir@
160abs_srcdir = @abs_srcdir@189abs_srcdir = @abs_srcdir@
161abs_top_builddir = @abs_top_builddir@190abs_top_builddir = @abs_top_builddir@
@@ -210,6 +239,7 @@
210top_srcdir = @top_srcdir@239top_srcdir = @top_srcdir@
211EXTRA_DIST = \240EXTRA_DIST = \
212 as-compiler-flag.m4 \241 as-compiler-flag.m4 \
242 as-linguas.m4 \
213 introspection.m4 \243 introspection.m4 \
214 Makefile.am.silent \244 Makefile.am.silent \
215 Makefile.am.enums \245 Makefile.am.enums \
@@ -230,9 +260,9 @@
230 exit 1;; \260 exit 1;; \
231 esac; \261 esac; \
232 done; \262 done; \
233 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu build/autotools/Makefile'; \263 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/autotools/Makefile'; \
234 $(am__cd) $(top_srcdir) && \264 $(am__cd) $(top_srcdir) && \
235 $(AUTOMAKE) --gnu build/autotools/Makefile265 $(AUTOMAKE) --foreign build/autotools/Makefile
236.PRECIOUS: Makefile266.PRECIOUS: Makefile
237Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status267Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
238 @case '$?' in \268 @case '$?' in \
239269
=== added file 'build/autotools/as-linguas.m4'
--- build/autotools/as-linguas.m4 1970-01-01 00:00:00 +0000
+++ build/autotools/as-linguas.m4 2011-06-20 20:11:46 +0000
@@ -0,0 +1,24 @@
1# Set ALL_ALL_LINGUAS based on the .po files present. Optional argument is the
2# name of the po directory. $podir/LINGUAS.ignore can be used to ignore a
3# subset of the po files.
4
5AC_DEFUN([AS_ALL_LINGUAS],
6[
7 AC_MSG_CHECKING([for linguas])
8 podir="m4_default([$1],[$srcdir/po])"
9 linguas=`cd $podir && ls *.po 2>/dev/null | awk 'BEGIN { FS="."; ORS=" " } { print $[]1 }'`
10 if test -f "$podir/LINGUAS.ignore"; then
11 ALL_LINGUAS="";
12 ignore_linguas=`sed -n -e 's/^\s\+\|\s\+$//g' -e '/^#/b' -e '/\S/!b' \
13 -e 's/\s\+/\n/g' -e p "$podir/LINGUAS.ignore"`;
14 for lang in $linguas; do
15 if ! echo "$ignore_linguas" | grep -q "^${lang}$"; then
16 ALL_LINGUAS="$ALL_LINGUAS $lang";
17 fi;
18 done;
19 else
20 ALL_LINGUAS="$linguas";
21 fi;
22 AC_SUBST([ALL_LINGUAS])
23 AC_MSG_RESULT($ALL_LINGUAS)
24])
025
=== added file 'build/autotools/gettext.m4'
--- build/autotools/gettext.m4 1970-01-01 00:00:00 +0000
+++ build/autotools/gettext.m4 2011-06-20 20:11:46 +0000
@@ -0,0 +1,383 @@
1# gettext.m4 serial 63 (gettext-0.18)
2dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6dnl
7dnl This file can can be used in projects which are not available under
8dnl the GNU General Public License or the GNU Library General Public
9dnl License but which still want to provide support for the GNU gettext
10dnl functionality.
11dnl Please note that the actual code of the GNU gettext library is covered
12dnl by the GNU Library General Public License, and the rest of the GNU
13dnl gettext package package is covered by the GNU General Public License.
14dnl They are *not* in the public domain.
15
16dnl Authors:
17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
19
20dnl Macro to add for using GNU gettext.
21
22dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
23dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
24dnl default (if it is not specified or empty) is 'no-libtool'.
25dnl INTLSYMBOL should be 'external' for packages with no intl directory,
26dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
27dnl If INTLSYMBOL is 'use-libtool', then a libtool library
28dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
29dnl depending on --{enable,disable}-{shared,static} and on the presence of
30dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
31dnl $(top_builddir)/intl/libintl.a will be created.
32dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
33dnl implementations (in libc or libintl) without the ngettext() function
34dnl will be ignored. If NEEDSYMBOL is specified and is
35dnl 'need-formatstring-macros', then GNU gettext implementations that don't
36dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
37dnl INTLDIR is used to find the intl libraries. If empty,
38dnl the value `$(top_builddir)/intl/' is used.
39dnl
40dnl The result of the configuration is one of three cases:
41dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
42dnl and used.
43dnl Catalog format: GNU --> install in $(datadir)
44dnl Catalog extension: .mo after installation, .gmo in source tree
45dnl 2) GNU gettext has been found in the system's C library.
46dnl Catalog format: GNU --> install in $(datadir)
47dnl Catalog extension: .mo after installation, .gmo in source tree
48dnl 3) No internationalization, always use English msgid.
49dnl Catalog format: none
50dnl Catalog extension: none
51dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
52dnl The use of .gmo is historical (it was needed to avoid overwriting the
53dnl GNU format catalogs when building on a platform with an X/Open gettext),
54dnl but we keep it in order not to force irrelevant filename changes on the
55dnl maintainers.
56dnl
57AC_DEFUN([AM_GNU_GETTEXT],
58[
59 dnl Argument checking.
60 ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
61 [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
62])])])])])
63 ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
64 [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
65 ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
66 [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
67])])])])
68 define([gt_included_intl],
69 ifelse([$1], [external],
70 ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
71 [yes]))
72 define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
73 gt_NEEDS_INIT
74 AM_GNU_GETTEXT_NEED([$2])
75
76 AC_REQUIRE([AM_PO_SUBDIRS])dnl
77 ifelse(gt_included_intl, yes, [
78 AC_REQUIRE([AM_INTL_SUBDIR])dnl
79 ])
80
81 dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
82 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
83 AC_REQUIRE([AC_LIB_RPATH])
84
85 dnl Sometimes libintl requires libiconv, so first search for libiconv.
86 dnl Ideally we would do this search only after the
87 dnl if test "$USE_NLS" = "yes"; then
88 dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
89 dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
90 dnl the configure script would need to contain the same shell code
91 dnl again, outside any 'if'. There are two solutions:
92 dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
93 dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
94 dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
95 dnl documented, we avoid it.
96 ifelse(gt_included_intl, yes, , [
97 AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
98 ])
99
100 dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
101 gt_INTL_MACOSX
102
103 dnl Set USE_NLS.
104 AC_REQUIRE([AM_NLS])
105
106 ifelse(gt_included_intl, yes, [
107 BUILD_INCLUDED_LIBINTL=no
108 USE_INCLUDED_LIBINTL=no
109 ])
110 LIBINTL=
111 LTLIBINTL=
112 POSUB=
113
114 dnl Add a version number to the cache macros.
115 case " $gt_needs " in
116 *" need-formatstring-macros "*) gt_api_version=3 ;;
117 *" need-ngettext "*) gt_api_version=2 ;;
118 *) gt_api_version=1 ;;
119 esac
120 gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
121 gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
122
123 dnl If we use NLS figure out what method
124 if test "$USE_NLS" = "yes"; then
125 gt_use_preinstalled_gnugettext=no
126 ifelse(gt_included_intl, yes, [
127 AC_MSG_CHECKING([whether included gettext is requested])
128 AC_ARG_WITH([included-gettext],
129 [ --with-included-gettext use the GNU gettext library included here],
130 nls_cv_force_use_gnu_gettext=$withval,
131 nls_cv_force_use_gnu_gettext=no)
132 AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
133
134 nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
135 if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
136 ])
137 dnl User does not insist on using GNU NLS library. Figure out what
138 dnl to use. If GNU gettext is available we use this. Else we have
139 dnl to fall back to GNU NLS library.
140
141 if test $gt_api_version -ge 3; then
142 gt_revision_test_code='
143#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
144#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
145#endif
146changequote(,)dnl
147typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
148changequote([,])dnl
149'
150 else
151 gt_revision_test_code=
152 fi
153 if test $gt_api_version -ge 2; then
154 gt_expression_test_code=' + * ngettext ("", "", 0)'
155 else
156 gt_expression_test_code=
157 fi
158
159 AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
160 [AC_TRY_LINK([#include <libintl.h>
161$gt_revision_test_code
162extern int _nl_msg_cat_cntr;
163extern int *_nl_domain_bindings;],
164 [bindtextdomain ("", "");
165return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
166 [eval "$gt_func_gnugettext_libc=yes"],
167 [eval "$gt_func_gnugettext_libc=no"])])
168
169 if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
170 dnl Sometimes libintl requires libiconv, so first search for libiconv.
171 ifelse(gt_included_intl, yes, , [
172 AM_ICONV_LINK
173 ])
174 dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
175 dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
176 dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
177 dnl even if libiconv doesn't exist.
178 AC_LIB_LINKFLAGS_BODY([intl])
179 AC_CACHE_CHECK([for GNU gettext in libintl],
180 [$gt_func_gnugettext_libintl],
181 [gt_save_CPPFLAGS="$CPPFLAGS"
182 CPPFLAGS="$CPPFLAGS $INCINTL"
183 gt_save_LIBS="$LIBS"
184 LIBS="$LIBS $LIBINTL"
185 dnl Now see whether libintl exists and does not depend on libiconv.
186 AC_TRY_LINK([#include <libintl.h>
187$gt_revision_test_code
188extern int _nl_msg_cat_cntr;
189extern
190#ifdef __cplusplus
191"C"
192#endif
193const char *_nl_expand_alias (const char *);],
194 [bindtextdomain ("", "");
195return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
196 [eval "$gt_func_gnugettext_libintl=yes"],
197 [eval "$gt_func_gnugettext_libintl=no"])
198 dnl Now see whether libintl exists and depends on libiconv.
199 if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
200 LIBS="$LIBS $LIBICONV"
201 AC_TRY_LINK([#include <libintl.h>
202$gt_revision_test_code
203extern int _nl_msg_cat_cntr;
204extern
205#ifdef __cplusplus
206"C"
207#endif
208const char *_nl_expand_alias (const char *);],
209 [bindtextdomain ("", "");
210return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
211 [LIBINTL="$LIBINTL $LIBICONV"
212 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
213 eval "$gt_func_gnugettext_libintl=yes"
214 ])
215 fi
216 CPPFLAGS="$gt_save_CPPFLAGS"
217 LIBS="$gt_save_LIBS"])
218 fi
219
220 dnl If an already present or preinstalled GNU gettext() is found,
221 dnl use it. But if this macro is used in GNU gettext, and GNU
222 dnl gettext is already preinstalled in libintl, we update this
223 dnl libintl. (Cf. the install rule in intl/Makefile.in.)
224 if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
225 || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
226 && test "$PACKAGE" != gettext-runtime \
227 && test "$PACKAGE" != gettext-tools; }; then
228 gt_use_preinstalled_gnugettext=yes
229 else
230 dnl Reset the values set by searching for libintl.
231 LIBINTL=
232 LTLIBINTL=
233 INCINTL=
234 fi
235
236 ifelse(gt_included_intl, yes, [
237 if test "$gt_use_preinstalled_gnugettext" != "yes"; then
238 dnl GNU gettext is not found in the C library.
239 dnl Fall back on included GNU gettext library.
240 nls_cv_use_gnu_gettext=yes
241 fi
242 fi
243
244 if test "$nls_cv_use_gnu_gettext" = "yes"; then
245 dnl Mark actions used to generate GNU NLS library.
246 BUILD_INCLUDED_LIBINTL=yes
247 USE_INCLUDED_LIBINTL=yes
248 LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
249 LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
250 LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
251 fi
252
253 CATOBJEXT=
254 if test "$gt_use_preinstalled_gnugettext" = "yes" \
255 || test "$nls_cv_use_gnu_gettext" = "yes"; then
256 dnl Mark actions to use GNU gettext tools.
257 CATOBJEXT=.gmo
258 fi
259 ])
260
261 if test -n "$INTL_MACOSX_LIBS"; then
262 if test "$gt_use_preinstalled_gnugettext" = "yes" \
263 || test "$nls_cv_use_gnu_gettext" = "yes"; then
264 dnl Some extra flags are needed during linking.
265 LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
266 LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
267 fi
268 fi
269
270 if test "$gt_use_preinstalled_gnugettext" = "yes" \
271 || test "$nls_cv_use_gnu_gettext" = "yes"; then
272 AC_DEFINE([ENABLE_NLS], [1],
273 [Define to 1 if translation of program messages to the user's native language
274 is requested.])
275 else
276 USE_NLS=no
277 fi
278 fi
279
280 AC_MSG_CHECKING([whether to use NLS])
281 AC_MSG_RESULT([$USE_NLS])
282 if test "$USE_NLS" = "yes"; then
283 AC_MSG_CHECKING([where the gettext function comes from])
284 if test "$gt_use_preinstalled_gnugettext" = "yes"; then
285 if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
286 gt_source="external libintl"
287 else
288 gt_source="libc"
289 fi
290 else
291 gt_source="included intl directory"
292 fi
293 AC_MSG_RESULT([$gt_source])
294 fi
295
296 if test "$USE_NLS" = "yes"; then
297
298 if test "$gt_use_preinstalled_gnugettext" = "yes"; then
299 if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
300 AC_MSG_CHECKING([how to link with libintl])
301 AC_MSG_RESULT([$LIBINTL])
302 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
303 fi
304
305 dnl For backward compatibility. Some packages may be using this.
306 AC_DEFINE([HAVE_GETTEXT], [1],
307 [Define if the GNU gettext() function is already present or preinstalled.])
308 AC_DEFINE([HAVE_DCGETTEXT], [1],
309 [Define if the GNU dcgettext() function is already present or preinstalled.])
310 fi
311
312 dnl We need to process the po/ directory.
313 POSUB=po
314 fi
315
316 ifelse(gt_included_intl, yes, [
317 dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
318 dnl to 'yes' because some of the testsuite requires it.
319 if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
320 BUILD_INCLUDED_LIBINTL=yes
321 fi
322
323 dnl Make all variables we use known to autoconf.
324 AC_SUBST([BUILD_INCLUDED_LIBINTL])
325 AC_SUBST([USE_INCLUDED_LIBINTL])
326 AC_SUBST([CATOBJEXT])
327
328 dnl For backward compatibility. Some configure.ins may be using this.
329 nls_cv_header_intl=
330 nls_cv_header_libgt=
331
332 dnl For backward compatibility. Some Makefiles may be using this.
333 DATADIRNAME=share
334 AC_SUBST([DATADIRNAME])
335
336 dnl For backward compatibility. Some Makefiles may be using this.
337 INSTOBJEXT=.mo
338 AC_SUBST([INSTOBJEXT])
339
340 dnl For backward compatibility. Some Makefiles may be using this.
341 GENCAT=gencat
342 AC_SUBST([GENCAT])
343
344 dnl For backward compatibility. Some Makefiles may be using this.
345 INTLOBJS=
346 if test "$USE_INCLUDED_LIBINTL" = yes; then
347 INTLOBJS="\$(GETTOBJS)"
348 fi
349 AC_SUBST([INTLOBJS])
350
351 dnl Enable libtool support if the surrounding package wishes it.
352 INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
353 AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
354 ])
355
356 dnl For backward compatibility. Some Makefiles may be using this.
357 INTLLIBS="$LIBINTL"
358 AC_SUBST([INTLLIBS])
359
360 dnl Make all documented variables known to autoconf.
361 AC_SUBST([LIBINTL])
362 AC_SUBST([LTLIBINTL])
363 AC_SUBST([POSUB])
364])
365
366
367dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
368m4_define([gt_NEEDS_INIT],
369[
370 m4_divert_text([DEFAULTS], [gt_needs=])
371 m4_define([gt_NEEDS_INIT], [])
372])
373
374
375dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
376AC_DEFUN([AM_GNU_GETTEXT_NEED],
377[
378 m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
379])
380
381
382dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
383AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
0384
=== added file 'build/autotools/iconv.m4'
--- build/autotools/iconv.m4 1970-01-01 00:00:00 +0000
+++ build/autotools/iconv.m4 2011-06-20 20:11:46 +0000
@@ -0,0 +1,199 @@
1# iconv.m4 serial 9 (gettext-0.18)
2dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6
7dnl From Bruno Haible.
8
9AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
10[
11 dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
12 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
13 AC_REQUIRE([AC_LIB_RPATH])
14
15 dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
16 dnl accordingly.
17 AC_LIB_LINKFLAGS_BODY([iconv])
18])
19
20AC_DEFUN([AM_ICONV_LINK],
21[
22 dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
23 dnl those with the standalone portable GNU libiconv installed).
24 AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
25
26 dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
27 dnl accordingly.
28 AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
29
30 dnl Add $INCICONV to CPPFLAGS before performing the following checks,
31 dnl because if the user has installed libiconv and not disabled its use
32 dnl via --without-libiconv-prefix, he wants to use it. The first
33 dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
34 am_save_CPPFLAGS="$CPPFLAGS"
35 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
36
37 AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
38 am_cv_func_iconv="no, consider installing GNU libiconv"
39 am_cv_lib_iconv=no
40 AC_TRY_LINK([#include <stdlib.h>
41#include <iconv.h>],
42 [iconv_t cd = iconv_open("","");
43 iconv(cd,NULL,NULL,NULL,NULL);
44 iconv_close(cd);],
45 [am_cv_func_iconv=yes])
46 if test "$am_cv_func_iconv" != yes; then
47 am_save_LIBS="$LIBS"
48 LIBS="$LIBS $LIBICONV"
49 AC_TRY_LINK([#include <stdlib.h>
50#include <iconv.h>],
51 [iconv_t cd = iconv_open("","");
52 iconv(cd,NULL,NULL,NULL,NULL);
53 iconv_close(cd);],
54 [am_cv_lib_iconv=yes]
55 [am_cv_func_iconv=yes])
56 LIBS="$am_save_LIBS"
57 fi
58 ])
59 if test "$am_cv_func_iconv" = yes; then
60 AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
61 dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
62 am_save_LIBS="$LIBS"
63 if test $am_cv_lib_iconv = yes; then
64 LIBS="$LIBS $LIBICONV"
65 fi
66 AC_TRY_RUN([
67#include <iconv.h>
68#include <string.h>
69int main ()
70{
71 /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
72 returns. */
73 {
74 iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
75 if (cd_utf8_to_88591 != (iconv_t)(-1))
76 {
77 static const char input[] = "\342\202\254"; /* EURO SIGN */
78 char buf[10];
79 const char *inptr = input;
80 size_t inbytesleft = strlen (input);
81 char *outptr = buf;
82 size_t outbytesleft = sizeof (buf);
83 size_t res = iconv (cd_utf8_to_88591,
84 (char **) &inptr, &inbytesleft,
85 &outptr, &outbytesleft);
86 if (res == 0)
87 return 1;
88 }
89 }
90 /* Test against Solaris 10 bug: Failures are not distinguishable from
91 successful returns. */
92 {
93 iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
94 if (cd_ascii_to_88591 != (iconv_t)(-1))
95 {
96 static const char input[] = "\263";
97 char buf[10];
98 const char *inptr = input;
99 size_t inbytesleft = strlen (input);
100 char *outptr = buf;
101 size_t outbytesleft = sizeof (buf);
102 size_t res = iconv (cd_ascii_to_88591,
103 (char **) &inptr, &inbytesleft,
104 &outptr, &outbytesleft);
105 if (res == 0)
106 return 1;
107 }
108 }
109#if 0 /* This bug could be worked around by the caller. */
110 /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
111 {
112 iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
113 if (cd_88591_to_utf8 != (iconv_t)(-1))
114 {
115 static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
116 char buf[50];
117 const char *inptr = input;
118 size_t inbytesleft = strlen (input);
119 char *outptr = buf;
120 size_t outbytesleft = sizeof (buf);
121 size_t res = iconv (cd_88591_to_utf8,
122 (char **) &inptr, &inbytesleft,
123 &outptr, &outbytesleft);
124 if ((int)res > 0)
125 return 1;
126 }
127 }
128#endif
129 /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
130 provided. */
131 if (/* Try standardized names. */
132 iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
133 /* Try IRIX, OSF/1 names. */
134 && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
135 /* Try AIX names. */
136 && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
137 /* Try HP-UX names. */
138 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
139 return 1;
140 return 0;
141}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
142 [case "$host_os" in
143 aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
144 *) am_cv_func_iconv_works="guessing yes" ;;
145 esac])
146 LIBS="$am_save_LIBS"
147 ])
148 case "$am_cv_func_iconv_works" in
149 *no) am_func_iconv=no am_cv_lib_iconv=no ;;
150 *) am_func_iconv=yes ;;
151 esac
152 else
153 am_func_iconv=no am_cv_lib_iconv=no
154 fi
155 if test "$am_func_iconv" = yes; then
156 AC_DEFINE([HAVE_ICONV], [1],
157 [Define if you have the iconv() function and it works.])
158 fi
159 if test "$am_cv_lib_iconv" = yes; then
160 AC_MSG_CHECKING([how to link with libiconv])
161 AC_MSG_RESULT([$LIBICONV])
162 else
163 dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
164 dnl either.
165 CPPFLAGS="$am_save_CPPFLAGS"
166 LIBICONV=
167 LTLIBICONV=
168 fi
169 AC_SUBST([LIBICONV])
170 AC_SUBST([LTLIBICONV])
171])
172
173AC_DEFUN([AM_ICONV],
174[
175 AM_ICONV_LINK
176 if test "$am_cv_func_iconv" = yes; then
177 AC_MSG_CHECKING([for iconv declaration])
178 AC_CACHE_VAL([am_cv_proto_iconv], [
179 AC_TRY_COMPILE([
180#include <stdlib.h>
181#include <iconv.h>
182extern
183#ifdef __cplusplus
184"C"
185#endif
186#if defined(__STDC__) || defined(__cplusplus)
187size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
188#else
189size_t iconv();
190#endif
191], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
192 am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
193 am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
194 AC_MSG_RESULT([
195 $am_cv_proto_iconv])
196 AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
197 [Define as const if the declaration of iconv() needs const.])
198 fi
199])
0200
=== added file 'build/autotools/intlmacosx.m4'
--- build/autotools/intlmacosx.m4 1970-01-01 00:00:00 +0000
+++ build/autotools/intlmacosx.m4 2011-06-20 20:11:46 +0000
@@ -0,0 +1,51 @@
1# intlmacosx.m4 serial 3 (gettext-0.18)
2dnl Copyright (C) 2004-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6dnl
7dnl This file can can be used in projects which are not available under
8dnl the GNU General Public License or the GNU Library General Public
9dnl License but which still want to provide support for the GNU gettext
10dnl functionality.
11dnl Please note that the actual code of the GNU gettext library is covered
12dnl by the GNU Library General Public License, and the rest of the GNU
13dnl gettext package package is covered by the GNU General Public License.
14dnl They are *not* in the public domain.
15
16dnl Checks for special options needed on MacOS X.
17dnl Defines INTL_MACOSX_LIBS.
18AC_DEFUN([gt_INTL_MACOSX],
19[
20 dnl Check for API introduced in MacOS X 10.2.
21 AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
22 [gt_cv_func_CFPreferencesCopyAppValue],
23 [gt_save_LIBS="$LIBS"
24 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
25 AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
26 [CFPreferencesCopyAppValue(NULL, NULL)],
27 [gt_cv_func_CFPreferencesCopyAppValue=yes],
28 [gt_cv_func_CFPreferencesCopyAppValue=no])
29 LIBS="$gt_save_LIBS"])
30 if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
31 AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
32 [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
33 fi
34 dnl Check for API introduced in MacOS X 10.3.
35 AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
36 [gt_save_LIBS="$LIBS"
37 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
38 AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
39 [gt_cv_func_CFLocaleCopyCurrent=yes],
40 [gt_cv_func_CFLocaleCopyCurrent=no])
41 LIBS="$gt_save_LIBS"])
42 if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
43 AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
44 [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
45 fi
46 INTL_MACOSX_LIBS=
47 if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
48 INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
49 fi
50 AC_SUBST([INTL_MACOSX_LIBS])
51])
052
=== added file 'build/autotools/lib-ld.m4'
--- build/autotools/lib-ld.m4 1970-01-01 00:00:00 +0000
+++ build/autotools/lib-ld.m4 2011-06-20 20:11:46 +0000
@@ -0,0 +1,110 @@
1# lib-ld.m4 serial 4 (gettext-0.18)
2dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6
7dnl Subroutines of libtool.m4,
8dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
9dnl with libtool.m4.
10
11dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
12AC_DEFUN([AC_LIB_PROG_LD_GNU],
13[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
14[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
15case `$LD -v 2>&1 </dev/null` in
16*GNU* | *'with BFD'*)
17 acl_cv_prog_gnu_ld=yes ;;
18*)
19 acl_cv_prog_gnu_ld=no ;;
20esac])
21with_gnu_ld=$acl_cv_prog_gnu_ld
22])
23
24dnl From libtool-1.4. Sets the variable LD.
25AC_DEFUN([AC_LIB_PROG_LD],
26[AC_ARG_WITH([gnu-ld],
27[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
28test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
29AC_REQUIRE([AC_PROG_CC])dnl
30AC_REQUIRE([AC_CANONICAL_HOST])dnl
31# Prepare PATH_SEPARATOR.
32# The user is always right.
33if test "${PATH_SEPARATOR+set}" != set; then
34 echo "#! /bin/sh" >conf$$.sh
35 echo "exit 0" >>conf$$.sh
36 chmod +x conf$$.sh
37 if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
38 PATH_SEPARATOR=';'
39 else
40 PATH_SEPARATOR=:
41 fi
42 rm -f conf$$.sh
43fi
44ac_prog=ld
45if test "$GCC" = yes; then
46 # Check if gcc -print-prog-name=ld gives a path.
47 AC_MSG_CHECKING([for ld used by GCC])
48 case $host in
49 *-*-mingw*)
50 # gcc leaves a trailing carriage return which upsets mingw
51 ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
52 *)
53 ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
54 esac
55 case $ac_prog in
56 # Accept absolute paths.
57 [[\\/]* | [A-Za-z]:[\\/]*)]
58 [re_direlt='/[^/][^/]*/\.\./']
59 # Canonicalize the path of ld
60 ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
61 while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
62 ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
63 done
64 test -z "$LD" && LD="$ac_prog"
65 ;;
66 "")
67 # If it fails, then pretend we aren't using GCC.
68 ac_prog=ld
69 ;;
70 *)
71 # If it is relative, then search for the first ld in PATH.
72 with_gnu_ld=unknown
73 ;;
74 esac
75elif test "$with_gnu_ld" = yes; then
76 AC_MSG_CHECKING([for GNU ld])
77else
78 AC_MSG_CHECKING([for non-GNU ld])
79fi
80AC_CACHE_VAL([acl_cv_path_LD],
81[if test -z "$LD"; then
82 IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
83 for ac_dir in $PATH; do
84 test -z "$ac_dir" && ac_dir=.
85 if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
86 acl_cv_path_LD="$ac_dir/$ac_prog"
87 # Check to see if the program is GNU ld. I'd rather use --version,
88 # but apparently some GNU ld's only accept -v.
89 # Break only if it was the GNU/non-GNU ld that we prefer.
90 case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
91 *GNU* | *'with BFD'*)
92 test "$with_gnu_ld" != no && break ;;
93 *)
94 test "$with_gnu_ld" != yes && break ;;
95 esac
96 fi
97 done
98 IFS="$ac_save_ifs"
99else
100 acl_cv_path_LD="$LD" # Let the user override the test with a path.
101fi])
102LD="$acl_cv_path_LD"
103if test -n "$LD"; then
104 AC_MSG_RESULT([$LD])
105else
106 AC_MSG_RESULT([no])
107fi
108test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
109AC_LIB_PROG_LD_GNU
110])
0111
=== added file 'build/autotools/lib-link.m4'
--- build/autotools/lib-link.m4 1970-01-01 00:00:00 +0000
+++ build/autotools/lib-link.m4 2011-06-20 20:11:46 +0000
@@ -0,0 +1,774 @@
1# lib-link.m4 serial 21 (gettext-0.18)
2dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6
7dnl From Bruno Haible.
8
9AC_PREREQ([2.54])
10
11dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
12dnl the libraries corresponding to explicit and implicit dependencies.
13dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
14dnl augments the CPPFLAGS variable.
15dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
16dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
17AC_DEFUN([AC_LIB_LINKFLAGS],
18[
19 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
20 AC_REQUIRE([AC_LIB_RPATH])
21 pushdef([Name],[translit([$1],[./-], [___])])
22 pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
23 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
24 AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
25 AC_LIB_LINKFLAGS_BODY([$1], [$2])
26 ac_cv_lib[]Name[]_libs="$LIB[]NAME"
27 ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
28 ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
29 ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
30 ])
31 LIB[]NAME="$ac_cv_lib[]Name[]_libs"
32 LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
33 INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
34 LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
35 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
36 AC_SUBST([LIB]NAME)
37 AC_SUBST([LTLIB]NAME)
38 AC_SUBST([LIB]NAME[_PREFIX])
39 dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
40 dnl results of this search when this library appears as a dependency.
41 HAVE_LIB[]NAME=yes
42 popdef([NAME])
43 popdef([Name])
44])
45
46dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
47dnl searches for libname and the libraries corresponding to explicit and
48dnl implicit dependencies, together with the specified include files and
49dnl the ability to compile and link the specified testcode. The missing-message
50dnl defaults to 'no' and may contain additional hints for the user.
51dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
52dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
53dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
54dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
55dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
56dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
57AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
58[
59 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
60 AC_REQUIRE([AC_LIB_RPATH])
61 pushdef([Name],[translit([$1],[./-], [___])])
62 pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
63 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
64
65 dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
66 dnl accordingly.
67 AC_LIB_LINKFLAGS_BODY([$1], [$2])
68
69 dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
70 dnl because if the user has installed lib[]Name and not disabled its use
71 dnl via --without-lib[]Name-prefix, he wants to use it.
72 ac_save_CPPFLAGS="$CPPFLAGS"
73 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
74
75 AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
76 ac_save_LIBS="$LIBS"
77 dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
78 dnl because these -l options might require -L options that are present in
79 dnl LIBS. -l options benefit only from the -L options listed before it.
80 dnl Otherwise, add it to the front of LIBS, because it may be a static
81 dnl library that depends on another static library that is present in LIBS.
82 dnl Static libraries benefit only from the static libraries listed after
83 dnl it.
84 case " $LIB[]NAME" in
85 *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
86 *) LIBS="$LIB[]NAME $LIBS" ;;
87 esac
88 AC_TRY_LINK([$3], [$4],
89 [ac_cv_lib[]Name=yes],
90 [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
91 LIBS="$ac_save_LIBS"
92 ])
93 if test "$ac_cv_lib[]Name" = yes; then
94 HAVE_LIB[]NAME=yes
95 AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
96 AC_MSG_CHECKING([how to link with lib[]$1])
97 AC_MSG_RESULT([$LIB[]NAME])
98 else
99 HAVE_LIB[]NAME=no
100 dnl If $LIB[]NAME didn't lead to a usable library, we don't need
101 dnl $INC[]NAME either.
102 CPPFLAGS="$ac_save_CPPFLAGS"
103 LIB[]NAME=
104 LTLIB[]NAME=
105 LIB[]NAME[]_PREFIX=
106 fi
107 AC_SUBST([HAVE_LIB]NAME)
108 AC_SUBST([LIB]NAME)
109 AC_SUBST([LTLIB]NAME)
110 AC_SUBST([LIB]NAME[_PREFIX])
111 popdef([NAME])
112 popdef([Name])
113])
114
115dnl Determine the platform dependent parameters needed to use rpath:
116dnl acl_libext,
117dnl acl_shlibext,
118dnl acl_hardcode_libdir_flag_spec,
119dnl acl_hardcode_libdir_separator,
120dnl acl_hardcode_direct,
121dnl acl_hardcode_minus_L.
122AC_DEFUN([AC_LIB_RPATH],
123[
124 dnl Tell automake >= 1.10 to complain if config.rpath is missing.
125 m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
126 AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
127 AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
128 AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
129 AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
130 AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
131 CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
132 ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
133 . ./conftest.sh
134 rm -f ./conftest.sh
135 acl_cv_rpath=done
136 ])
137 wl="$acl_cv_wl"
138 acl_libext="$acl_cv_libext"
139 acl_shlibext="$acl_cv_shlibext"
140 acl_libname_spec="$acl_cv_libname_spec"
141 acl_library_names_spec="$acl_cv_library_names_spec"
142 acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
143 acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
144 acl_hardcode_direct="$acl_cv_hardcode_direct"
145 acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
146 dnl Determine whether the user wants rpath handling at all.
147 AC_ARG_ENABLE([rpath],
148 [ --disable-rpath do not hardcode runtime library paths],
149 :, enable_rpath=yes)
150])
151
152dnl AC_LIB_FROMPACKAGE(name, package)
153dnl declares that libname comes from the given package. The configure file
154dnl will then not have a --with-libname-prefix option but a
155dnl --with-package-prefix option. Several libraries can come from the same
156dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
157dnl macro call that searches for libname.
158AC_DEFUN([AC_LIB_FROMPACKAGE],
159[
160 pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
161 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
162 define([acl_frompackage_]NAME, [$2])
163 popdef([NAME])
164 pushdef([PACK],[$2])
165 pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
166 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
167 define([acl_libsinpackage_]PACKUP,
168 m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
169 popdef([PACKUP])
170 popdef([PACK])
171])
172
173dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
174dnl the libraries corresponding to explicit and implicit dependencies.
175dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
176dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
177dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
178AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
179[
180 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
181 pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
182 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
183 pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
184 pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
185 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
186 pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
187 dnl Autoconf >= 2.61 supports dots in --with options.
188 pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
189 dnl By default, look in $includedir and $libdir.
190 use_additional=yes
191 AC_LIB_WITH_FINAL_PREFIX([
192 eval additional_includedir=\"$includedir\"
193 eval additional_libdir=\"$libdir\"
194 ])
195 AC_ARG_WITH(P_A_C_K[-prefix],
196[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
197 --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
198[
199 if test "X$withval" = "Xno"; then
200 use_additional=no
201 else
202 if test "X$withval" = "X"; then
203 AC_LIB_WITH_FINAL_PREFIX([
204 eval additional_includedir=\"$includedir\"
205 eval additional_libdir=\"$libdir\"
206 ])
207 else
208 additional_includedir="$withval/include"
209 additional_libdir="$withval/$acl_libdirstem"
210 if test "$acl_libdirstem2" != "$acl_libdirstem" \
211 && ! test -d "$withval/$acl_libdirstem"; then
212 additional_libdir="$withval/$acl_libdirstem2"
213 fi
214 fi
215 fi
216])
217 dnl Search the library and its dependencies in $additional_libdir and
218 dnl $LDFLAGS. Using breadth-first-seach.
219 LIB[]NAME=
220 LTLIB[]NAME=
221 INC[]NAME=
222 LIB[]NAME[]_PREFIX=
223 dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
224 dnl computed. So it has to be reset here.
225 HAVE_LIB[]NAME=
226 rpathdirs=
227 ltrpathdirs=
228 names_already_handled=
229 names_next_round='$1 $2'
230 while test -n "$names_next_round"; do
231 names_this_round="$names_next_round"
232 names_next_round=
233 for name in $names_this_round; do
234 already_handled=
235 for n in $names_already_handled; do
236 if test "$n" = "$name"; then
237 already_handled=yes
238 break
239 fi
240 done
241 if test -z "$already_handled"; then
242 names_already_handled="$names_already_handled $name"
243 dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
244 dnl or AC_LIB_HAVE_LINKFLAGS call.
245 uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
246 eval value=\"\$HAVE_LIB$uppername\"
247 if test -n "$value"; then
248 if test "$value" = yes; then
249 eval value=\"\$LIB$uppername\"
250 test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
251 eval value=\"\$LTLIB$uppername\"
252 test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
253 else
254 dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
255 dnl that this library doesn't exist. So just drop it.
256 :
257 fi
258 else
259 dnl Search the library lib$name in $additional_libdir and $LDFLAGS
260 dnl and the already constructed $LIBNAME/$LTLIBNAME.
261 found_dir=
262 found_la=
263 found_so=
264 found_a=
265 eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
266 if test -n "$acl_shlibext"; then
267 shrext=".$acl_shlibext" # typically: shrext=.so
268 else
269 shrext=
270 fi
271 if test $use_additional = yes; then
272 dir="$additional_libdir"
273 dnl The same code as in the loop below:
274 dnl First look for a shared library.
275 if test -n "$acl_shlibext"; then
276 if test -f "$dir/$libname$shrext"; then
277 found_dir="$dir"
278 found_so="$dir/$libname$shrext"
279 else
280 if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
281 ver=`(cd "$dir" && \
282 for f in "$libname$shrext".*; do echo "$f"; done \
283 | sed -e "s,^$libname$shrext\\\\.,," \
284 | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
285 | sed 1q ) 2>/dev/null`
286 if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
287 found_dir="$dir"
288 found_so="$dir/$libname$shrext.$ver"
289 fi
290 else
291 eval library_names=\"$acl_library_names_spec\"
292 for f in $library_names; do
293 if test -f "$dir/$f"; then
294 found_dir="$dir"
295 found_so="$dir/$f"
296 break
297 fi
298 done
299 fi
300 fi
301 fi
302 dnl Then look for a static library.
303 if test "X$found_dir" = "X"; then
304 if test -f "$dir/$libname.$acl_libext"; then
305 found_dir="$dir"
306 found_a="$dir/$libname.$acl_libext"
307 fi
308 fi
309 if test "X$found_dir" != "X"; then
310 if test -f "$dir/$libname.la"; then
311 found_la="$dir/$libname.la"
312 fi
313 fi
314 fi
315 if test "X$found_dir" = "X"; then
316 for x in $LDFLAGS $LTLIB[]NAME; do
317 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
318 case "$x" in
319 -L*)
320 dir=`echo "X$x" | sed -e 's/^X-L//'`
321 dnl First look for a shared library.
322 if test -n "$acl_shlibext"; then
323 if test -f "$dir/$libname$shrext"; then
324 found_dir="$dir"
325 found_so="$dir/$libname$shrext"
326 else
327 if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
328 ver=`(cd "$dir" && \
329 for f in "$libname$shrext".*; do echo "$f"; done \
330 | sed -e "s,^$libname$shrext\\\\.,," \
331 | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
332 | sed 1q ) 2>/dev/null`
333 if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
334 found_dir="$dir"
335 found_so="$dir/$libname$shrext.$ver"
336 fi
337 else
338 eval library_names=\"$acl_library_names_spec\"
339 for f in $library_names; do
340 if test -f "$dir/$f"; then
341 found_dir="$dir"
342 found_so="$dir/$f"
343 break
344 fi
345 done
346 fi
347 fi
348 fi
349 dnl Then look for a static library.
350 if test "X$found_dir" = "X"; then
351 if test -f "$dir/$libname.$acl_libext"; then
352 found_dir="$dir"
353 found_a="$dir/$libname.$acl_libext"
354 fi
355 fi
356 if test "X$found_dir" != "X"; then
357 if test -f "$dir/$libname.la"; then
358 found_la="$dir/$libname.la"
359 fi
360 fi
361 ;;
362 esac
363 if test "X$found_dir" != "X"; then
364 break
365 fi
366 done
367 fi
368 if test "X$found_dir" != "X"; then
369 dnl Found the library.
370 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
371 if test "X$found_so" != "X"; then
372 dnl Linking with a shared library. We attempt to hardcode its
373 dnl directory into the executable's runpath, unless it's the
374 dnl standard /usr/lib.
375 if test "$enable_rpath" = no \
376 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
377 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
378 dnl No hardcoding is needed.
379 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
380 else
381 dnl Use an explicit option to hardcode DIR into the resulting
382 dnl binary.
383 dnl Potentially add DIR to ltrpathdirs.
384 dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
385 haveit=
386 for x in $ltrpathdirs; do
387 if test "X$x" = "X$found_dir"; then
388 haveit=yes
389 break
390 fi
391 done
392 if test -z "$haveit"; then
393 ltrpathdirs="$ltrpathdirs $found_dir"
394 fi
395 dnl The hardcoding into $LIBNAME is system dependent.
396 if test "$acl_hardcode_direct" = yes; then
397 dnl Using DIR/libNAME.so during linking hardcodes DIR into the
398 dnl resulting binary.
399 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
400 else
401 if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
402 dnl Use an explicit option to hardcode DIR into the resulting
403 dnl binary.
404 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
405 dnl Potentially add DIR to rpathdirs.
406 dnl The rpathdirs will be appended to $LIBNAME at the end.
407 haveit=
408 for x in $rpathdirs; do
409 if test "X$x" = "X$found_dir"; then
410 haveit=yes
411 break
412 fi
413 done
414 if test -z "$haveit"; then
415 rpathdirs="$rpathdirs $found_dir"
416 fi
417 else
418 dnl Rely on "-L$found_dir".
419 dnl But don't add it if it's already contained in the LDFLAGS
420 dnl or the already constructed $LIBNAME
421 haveit=
422 for x in $LDFLAGS $LIB[]NAME; do
423 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
424 if test "X$x" = "X-L$found_dir"; then
425 haveit=yes
426 break
427 fi
428 done
429 if test -z "$haveit"; then
430 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
431 fi
432 if test "$acl_hardcode_minus_L" != no; then
433 dnl FIXME: Not sure whether we should use
434 dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
435 dnl here.
436 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
437 else
438 dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
439 dnl here, because this doesn't fit in flags passed to the
440 dnl compiler. So give up. No hardcoding. This affects only
441 dnl very old systems.
442 dnl FIXME: Not sure whether we should use
443 dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
444 dnl here.
445 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
446 fi
447 fi
448 fi
449 fi
450 else
451 if test "X$found_a" != "X"; then
452 dnl Linking with a static library.
453 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
454 else
455 dnl We shouldn't come here, but anyway it's good to have a
456 dnl fallback.
457 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
458 fi
459 fi
460 dnl Assume the include files are nearby.
461 additional_includedir=
462 case "$found_dir" in
463 */$acl_libdirstem | */$acl_libdirstem/)
464 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
465 if test "$name" = '$1'; then
466 LIB[]NAME[]_PREFIX="$basedir"
467 fi
468 additional_includedir="$basedir/include"
469 ;;
470 */$acl_libdirstem2 | */$acl_libdirstem2/)
471 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
472 if test "$name" = '$1'; then
473 LIB[]NAME[]_PREFIX="$basedir"
474 fi
475 additional_includedir="$basedir/include"
476 ;;
477 esac
478 if test "X$additional_includedir" != "X"; then
479 dnl Potentially add $additional_includedir to $INCNAME.
480 dnl But don't add it
481 dnl 1. if it's the standard /usr/include,
482 dnl 2. if it's /usr/local/include and we are using GCC on Linux,
483 dnl 3. if it's already present in $CPPFLAGS or the already
484 dnl constructed $INCNAME,
485 dnl 4. if it doesn't exist as a directory.
486 if test "X$additional_includedir" != "X/usr/include"; then
487 haveit=
488 if test "X$additional_includedir" = "X/usr/local/include"; then
489 if test -n "$GCC"; then
490 case $host_os in
491 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
492 esac
493 fi
494 fi
495 if test -z "$haveit"; then
496 for x in $CPPFLAGS $INC[]NAME; do
497 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
498 if test "X$x" = "X-I$additional_includedir"; then
499 haveit=yes
500 break
501 fi
502 done
503 if test -z "$haveit"; then
504 if test -d "$additional_includedir"; then
505 dnl Really add $additional_includedir to $INCNAME.
506 INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
507 fi
508 fi
509 fi
510 fi
511 fi
512 dnl Look for dependencies.
513 if test -n "$found_la"; then
514 dnl Read the .la file. It defines the variables
515 dnl dlname, library_names, old_library, dependency_libs, current,
516 dnl age, revision, installed, dlopen, dlpreopen, libdir.
517 save_libdir="$libdir"
518 case "$found_la" in
519 */* | *\\*) . "$found_la" ;;
520 *) . "./$found_la" ;;
521 esac
522 libdir="$save_libdir"
523 dnl We use only dependency_libs.
524 for dep in $dependency_libs; do
525 case "$dep" in
526 -L*)
527 additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
528 dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
529 dnl But don't add it
530 dnl 1. if it's the standard /usr/lib,
531 dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
532 dnl 3. if it's already present in $LDFLAGS or the already
533 dnl constructed $LIBNAME,
534 dnl 4. if it doesn't exist as a directory.
535 if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
536 && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
537 haveit=
538 if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
539 || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
540 if test -n "$GCC"; then
541 case $host_os in
542 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
543 esac
544 fi
545 fi
546 if test -z "$haveit"; then
547 haveit=
548 for x in $LDFLAGS $LIB[]NAME; do
549 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
550 if test "X$x" = "X-L$additional_libdir"; then
551 haveit=yes
552 break
553 fi
554 done
555 if test -z "$haveit"; then
556 if test -d "$additional_libdir"; then
557 dnl Really add $additional_libdir to $LIBNAME.
558 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
559 fi
560 fi
561 haveit=
562 for x in $LDFLAGS $LTLIB[]NAME; do
563 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
564 if test "X$x" = "X-L$additional_libdir"; then
565 haveit=yes
566 break
567 fi
568 done
569 if test -z "$haveit"; then
570 if test -d "$additional_libdir"; then
571 dnl Really add $additional_libdir to $LTLIBNAME.
572 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
573 fi
574 fi
575 fi
576 fi
577 ;;
578 -R*)
579 dir=`echo "X$dep" | sed -e 's/^X-R//'`
580 if test "$enable_rpath" != no; then
581 dnl Potentially add DIR to rpathdirs.
582 dnl The rpathdirs will be appended to $LIBNAME at the end.
583 haveit=
584 for x in $rpathdirs; do
585 if test "X$x" = "X$dir"; then
586 haveit=yes
587 break
588 fi
589 done
590 if test -z "$haveit"; then
591 rpathdirs="$rpathdirs $dir"
592 fi
593 dnl Potentially add DIR to ltrpathdirs.
594 dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
595 haveit=
596 for x in $ltrpathdirs; do
597 if test "X$x" = "X$dir"; then
598 haveit=yes
599 break
600 fi
601 done
602 if test -z "$haveit"; then
603 ltrpathdirs="$ltrpathdirs $dir"
604 fi
605 fi
606 ;;
607 -l*)
608 dnl Handle this in the next round.
609 names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
610 ;;
611 *.la)
612 dnl Handle this in the next round. Throw away the .la's
613 dnl directory; it is already contained in a preceding -L
614 dnl option.
615 names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
616 ;;
617 *)
618 dnl Most likely an immediate library name.
619 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
620 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
621 ;;
622 esac
623 done
624 fi
625 else
626 dnl Didn't find the library; assume it is in the system directories
627 dnl known to the linker and runtime loader. (All the system
628 dnl directories known to the linker should also be known to the
629 dnl runtime loader, otherwise the system is severely misconfigured.)
630 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
631 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
632 fi
633 fi
634 fi
635 done
636 done
637 if test "X$rpathdirs" != "X"; then
638 if test -n "$acl_hardcode_libdir_separator"; then
639 dnl Weird platform: only the last -rpath option counts, the user must
640 dnl pass all path elements in one option. We can arrange that for a
641 dnl single library, but not when more than one $LIBNAMEs are used.
642 alldirs=
643 for found_dir in $rpathdirs; do
644 alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
645 done
646 dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
647 acl_save_libdir="$libdir"
648 libdir="$alldirs"
649 eval flag=\"$acl_hardcode_libdir_flag_spec\"
650 libdir="$acl_save_libdir"
651 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
652 else
653 dnl The -rpath options are cumulative.
654 for found_dir in $rpathdirs; do
655 acl_save_libdir="$libdir"
656 libdir="$found_dir"
657 eval flag=\"$acl_hardcode_libdir_flag_spec\"
658 libdir="$acl_save_libdir"
659 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
660 done
661 fi
662 fi
663 if test "X$ltrpathdirs" != "X"; then
664 dnl When using libtool, the option that works for both libraries and
665 dnl executables is -R. The -R options are cumulative.
666 for found_dir in $ltrpathdirs; do
667 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
668 done
669 fi
670 popdef([P_A_C_K])
671 popdef([PACKLIBS])
672 popdef([PACKUP])
673 popdef([PACK])
674 popdef([NAME])
675])
676
677dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
678dnl unless already present in VAR.
679dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
680dnl contains two or three consecutive elements that belong together.
681AC_DEFUN([AC_LIB_APPENDTOVAR],
682[
683 for element in [$2]; do
684 haveit=
685 for x in $[$1]; do
686 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
687 if test "X$x" = "X$element"; then
688 haveit=yes
689 break
690 fi
691 done
692 if test -z "$haveit"; then
693 [$1]="${[$1]}${[$1]:+ }$element"
694 fi
695 done
696])
697
698dnl For those cases where a variable contains several -L and -l options
699dnl referring to unknown libraries and directories, this macro determines the
700dnl necessary additional linker options for the runtime path.
701dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
702dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
703dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
704dnl otherwise linking without libtool is assumed.
705AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
706[
707 AC_REQUIRE([AC_LIB_RPATH])
708 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
709 $1=
710 if test "$enable_rpath" != no; then
711 if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
712 dnl Use an explicit option to hardcode directories into the resulting
713 dnl binary.
714 rpathdirs=
715 next=
716 for opt in $2; do
717 if test -n "$next"; then
718 dir="$next"
719 dnl No need to hardcode the standard /usr/lib.
720 if test "X$dir" != "X/usr/$acl_libdirstem" \
721 && test "X$dir" != "X/usr/$acl_libdirstem2"; then
722 rpathdirs="$rpathdirs $dir"
723 fi
724 next=
725 else
726 case $opt in
727 -L) next=yes ;;
728 -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
729 dnl No need to hardcode the standard /usr/lib.
730 if test "X$dir" != "X/usr/$acl_libdirstem" \
731 && test "X$dir" != "X/usr/$acl_libdirstem2"; then
732 rpathdirs="$rpathdirs $dir"
733 fi
734 next= ;;
735 *) next= ;;
736 esac
737 fi
738 done
739 if test "X$rpathdirs" != "X"; then
740 if test -n ""$3""; then
741 dnl libtool is used for linking. Use -R options.
742 for dir in $rpathdirs; do
743 $1="${$1}${$1:+ }-R$dir"
744 done
745 else
746 dnl The linker is used for linking directly.
747 if test -n "$acl_hardcode_libdir_separator"; then
748 dnl Weird platform: only the last -rpath option counts, the user
749 dnl must pass all path elements in one option.
750 alldirs=
751 for dir in $rpathdirs; do
752 alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
753 done
754 acl_save_libdir="$libdir"
755 libdir="$alldirs"
756 eval flag=\"$acl_hardcode_libdir_flag_spec\"
757 libdir="$acl_save_libdir"
758 $1="$flag"
759 else
760 dnl The -rpath options are cumulative.
761 for dir in $rpathdirs; do
762 acl_save_libdir="$libdir"
763 libdir="$dir"
764 eval flag=\"$acl_hardcode_libdir_flag_spec\"
765 libdir="$acl_save_libdir"
766 $1="${$1}${$1:+ }$flag"
767 done
768 fi
769 fi
770 fi
771 fi
772 fi
773 AC_SUBST([$1])
774])
0775
=== added file 'build/autotools/lib-prefix.m4'
--- build/autotools/lib-prefix.m4 1970-01-01 00:00:00 +0000
+++ build/autotools/lib-prefix.m4 2011-06-20 20:11:46 +0000
@@ -0,0 +1,224 @@
1# lib-prefix.m4 serial 7 (gettext-0.18)
2dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6
7dnl From Bruno Haible.
8
9dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
10dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
11dnl require excessive bracketing.
12ifdef([AC_HELP_STRING],
13[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
14[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
15
16dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
17dnl to access previously installed libraries. The basic assumption is that
18dnl a user will want packages to use other packages he previously installed
19dnl with the same --prefix option.
20dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
21dnl libraries, but is otherwise very convenient.
22AC_DEFUN([AC_LIB_PREFIX],
23[
24 AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
25 AC_REQUIRE([AC_PROG_CC])
26 AC_REQUIRE([AC_CANONICAL_HOST])
27 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
28 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
29 dnl By default, look in $includedir and $libdir.
30 use_additional=yes
31 AC_LIB_WITH_FINAL_PREFIX([
32 eval additional_includedir=\"$includedir\"
33 eval additional_libdir=\"$libdir\"
34 ])
35 AC_LIB_ARG_WITH([lib-prefix],
36[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
37 --without-lib-prefix don't search for libraries in includedir and libdir],
38[
39 if test "X$withval" = "Xno"; then
40 use_additional=no
41 else
42 if test "X$withval" = "X"; then
43 AC_LIB_WITH_FINAL_PREFIX([
44 eval additional_includedir=\"$includedir\"
45 eval additional_libdir=\"$libdir\"
46 ])
47 else
48 additional_includedir="$withval/include"
49 additional_libdir="$withval/$acl_libdirstem"
50 fi
51 fi
52])
53 if test $use_additional = yes; then
54 dnl Potentially add $additional_includedir to $CPPFLAGS.
55 dnl But don't add it
56 dnl 1. if it's the standard /usr/include,
57 dnl 2. if it's already present in $CPPFLAGS,
58 dnl 3. if it's /usr/local/include and we are using GCC on Linux,
59 dnl 4. if it doesn't exist as a directory.
60 if test "X$additional_includedir" != "X/usr/include"; then
61 haveit=
62 for x in $CPPFLAGS; do
63 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
64 if test "X$x" = "X-I$additional_includedir"; then
65 haveit=yes
66 break
67 fi
68 done
69 if test -z "$haveit"; then
70 if test "X$additional_includedir" = "X/usr/local/include"; then
71 if test -n "$GCC"; then
72 case $host_os in
73 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
74 esac
75 fi
76 fi
77 if test -z "$haveit"; then
78 if test -d "$additional_includedir"; then
79 dnl Really add $additional_includedir to $CPPFLAGS.
80 CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
81 fi
82 fi
83 fi
84 fi
85 dnl Potentially add $additional_libdir to $LDFLAGS.
86 dnl But don't add it
87 dnl 1. if it's the standard /usr/lib,
88 dnl 2. if it's already present in $LDFLAGS,
89 dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
90 dnl 4. if it doesn't exist as a directory.
91 if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
92 haveit=
93 for x in $LDFLAGS; do
94 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
95 if test "X$x" = "X-L$additional_libdir"; then
96 haveit=yes
97 break
98 fi
99 done
100 if test -z "$haveit"; then
101 if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
102 if test -n "$GCC"; then
103 case $host_os in
104 linux*) haveit=yes;;
105 esac
106 fi
107 fi
108 if test -z "$haveit"; then
109 if test -d "$additional_libdir"; then
110 dnl Really add $additional_libdir to $LDFLAGS.
111 LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
112 fi
113 fi
114 fi
115 fi
116 fi
117])
118
119dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
120dnl acl_final_exec_prefix, containing the values to which $prefix and
121dnl $exec_prefix will expand at the end of the configure script.
122AC_DEFUN([AC_LIB_PREPARE_PREFIX],
123[
124 dnl Unfortunately, prefix and exec_prefix get only finally determined
125 dnl at the end of configure.
126 if test "X$prefix" = "XNONE"; then
127 acl_final_prefix="$ac_default_prefix"
128 else
129 acl_final_prefix="$prefix"
130 fi
131 if test "X$exec_prefix" = "XNONE"; then
132 acl_final_exec_prefix='${prefix}'
133 else
134 acl_final_exec_prefix="$exec_prefix"
135 fi
136 acl_save_prefix="$prefix"
137 prefix="$acl_final_prefix"
138 eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
139 prefix="$acl_save_prefix"
140])
141
142dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
143dnl variables prefix and exec_prefix bound to the values they will have
144dnl at the end of the configure script.
145AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
146[
147 acl_save_prefix="$prefix"
148 prefix="$acl_final_prefix"
149 acl_save_exec_prefix="$exec_prefix"
150 exec_prefix="$acl_final_exec_prefix"
151 $1
152 exec_prefix="$acl_save_exec_prefix"
153 prefix="$acl_save_prefix"
154])
155
156dnl AC_LIB_PREPARE_MULTILIB creates
157dnl - a variable acl_libdirstem, containing the basename of the libdir, either
158dnl "lib" or "lib64" or "lib/64",
159dnl - a variable acl_libdirstem2, as a secondary possible value for
160dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
161dnl "lib/amd64".
162AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
163[
164 dnl There is no formal standard regarding lib and lib64.
165 dnl On glibc systems, the current practice is that on a system supporting
166 dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
167 dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
168 dnl the compiler's default mode by looking at the compiler's library search
169 dnl path. If at least one of its elements ends in /lib64 or points to a
170 dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
171 dnl Otherwise we use the default, namely "lib".
172 dnl On Solaris systems, the current practice is that on a system supporting
173 dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
174 dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
175 dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
176 AC_REQUIRE([AC_CANONICAL_HOST])
177 acl_libdirstem=lib
178 acl_libdirstem2=
179 case "$host_os" in
180 solaris*)
181 dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
182 dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
183 dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
184 dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
185 dnl symlink is missing, so we set acl_libdirstem2 too.
186 AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
187 [AC_EGREP_CPP([sixtyfour bits], [
188#ifdef _LP64
189sixtyfour bits
190#endif
191 ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
192 ])
193 if test $gl_cv_solaris_64bit = yes; then
194 acl_libdirstem=lib/64
195 case "$host_cpu" in
196 sparc*) acl_libdirstem2=lib/sparcv9 ;;
197 i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
198 esac
199 fi
200 ;;
201 *)
202 searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
203 if test -n "$searchpath"; then
204 acl_save_IFS="${IFS= }"; IFS=":"
205 for searchdir in $searchpath; do
206 if test -d "$searchdir"; then
207 case "$searchdir" in
208 */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
209 */../ | */.. )
210 # Better ignore directories of this form. They are misleading.
211 ;;
212 *) searchdir=`cd "$searchdir" && pwd`
213 case "$searchdir" in
214 */lib64 ) acl_libdirstem=lib64 ;;
215 esac ;;
216 esac
217 fi
218 done
219 IFS="$acl_save_IFS"
220 fi
221 ;;
222 esac
223 test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
224])
0225
=== added file 'build/autotools/nls.m4'
--- build/autotools/nls.m4 1970-01-01 00:00:00 +0000
+++ build/autotools/nls.m4 2011-06-20 20:11:46 +0000
@@ -0,0 +1,32 @@
1# nls.m4 serial 5 (gettext-0.18)
2dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
3dnl Inc.
4dnl This file is free software; the Free Software Foundation
5dnl gives unlimited permission to copy and/or distribute it,
6dnl with or without modifications, as long as this notice is preserved.
7dnl
8dnl This file can can be used in projects which are not available under
9dnl the GNU General Public License or the GNU Library General Public
10dnl License but which still want to provide support for the GNU gettext
11dnl functionality.
12dnl Please note that the actual code of the GNU gettext library is covered
13dnl by the GNU Library General Public License, and the rest of the GNU
14dnl gettext package package is covered by the GNU General Public License.
15dnl They are *not* in the public domain.
16
17dnl Authors:
18dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
19dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
20
21AC_PREREQ([2.50])
22
23AC_DEFUN([AM_NLS],
24[
25 AC_MSG_CHECKING([whether NLS is requested])
26 dnl Default is enabled NLS
27 AC_ARG_ENABLE([nls],
28 [ --disable-nls do not use Native Language Support],
29 USE_NLS=$enableval, USE_NLS=yes)
30 AC_MSG_RESULT([$USE_NLS])
31 AC_SUBST([USE_NLS])
32])
033
=== added file 'build/autotools/po.m4'
--- build/autotools/po.m4 1970-01-01 00:00:00 +0000
+++ build/autotools/po.m4 2011-06-20 20:11:46 +0000
@@ -0,0 +1,449 @@
1# po.m4 serial 17 (gettext-0.18)
2dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6dnl
7dnl This file can can be used in projects which are not available under
8dnl the GNU General Public License or the GNU Library General Public
9dnl License but which still want to provide support for the GNU gettext
10dnl functionality.
11dnl Please note that the actual code of the GNU gettext library is covered
12dnl by the GNU Library General Public License, and the rest of the GNU
13dnl gettext package package is covered by the GNU General Public License.
14dnl They are *not* in the public domain.
15
16dnl Authors:
17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
19
20AC_PREREQ([2.50])
21
22dnl Checks for all prerequisites of the po subdirectory.
23AC_DEFUN([AM_PO_SUBDIRS],
24[
25 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
26 AC_REQUIRE([AC_PROG_INSTALL])dnl
27 AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
28 AC_REQUIRE([AM_NLS])dnl
29
30 dnl Release version of the gettext macros. This is used to ensure that
31 dnl the gettext macros and po/Makefile.in.in are in sync.
32 AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
33
34 dnl Perform the following tests also if --disable-nls has been given,
35 dnl because they are needed for "make dist" to work.
36
37 dnl Search for GNU msgfmt in the PATH.
38 dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
39 dnl The second test excludes FreeBSD msgfmt.
40 AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
41 [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
42 (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
43 :)
44 AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
45
46 dnl Test whether it is GNU msgfmt >= 0.15.
47changequote(,)dnl
48 case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
49 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
50 *) MSGFMT_015=$MSGFMT ;;
51 esac
52changequote([,])dnl
53 AC_SUBST([MSGFMT_015])
54changequote(,)dnl
55 case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
56 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
57 *) GMSGFMT_015=$GMSGFMT ;;
58 esac
59changequote([,])dnl
60 AC_SUBST([GMSGFMT_015])
61
62 dnl Search for GNU xgettext 0.12 or newer in the PATH.
63 dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
64 dnl The second test excludes FreeBSD xgettext.
65 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
66 [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
67 (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)],
68 :)
69 dnl Remove leftover from FreeBSD xgettext call.
70 rm -f messages.po
71
72 dnl Test whether it is GNU xgettext >= 0.15.
73changequote(,)dnl
74 case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
75 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
76 *) XGETTEXT_015=$XGETTEXT ;;
77 esac
78changequote([,])dnl
79 AC_SUBST([XGETTEXT_015])
80
81 dnl Search for GNU msgmerge 0.11 or newer in the PATH.
82 AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
83 [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
84
85 dnl Installation directories.
86 dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
87 dnl have to define it here, so that it can be used in po/Makefile.
88 test -n "$localedir" || localedir='${datadir}/locale'
89 AC_SUBST([localedir])
90
91 dnl Support for AM_XGETTEXT_OPTION.
92 test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
93 AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
94
95 AC_CONFIG_COMMANDS([po-directories], [[
96 for ac_file in $CONFIG_FILES; do
97 # Support "outfile[:infile[:infile...]]"
98 case "$ac_file" in
99 *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
100 esac
101 # PO directories have a Makefile.in generated from Makefile.in.in.
102 case "$ac_file" in */Makefile.in)
103 # Adjust a relative srcdir.
104 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
105 ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
106 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
107 # In autoconf-2.13 it is called $ac_given_srcdir.
108 # In autoconf-2.50 it is called $srcdir.
109 test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
110 case "$ac_given_srcdir" in
111 .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
112 /*) top_srcdir="$ac_given_srcdir" ;;
113 *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
114 esac
115 # Treat a directory as a PO directory if and only if it has a
116 # POTFILES.in file. This allows packages to have multiple PO
117 # directories under different names or in different locations.
118 if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
119 rm -f "$ac_dir/POTFILES"
120 test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
121 cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
122 POMAKEFILEDEPS="POTFILES.in"
123 # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
124 # on $ac_dir but don't depend on user-specified configuration
125 # parameters.
126 if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
127 # The LINGUAS file contains the set of available languages.
128 if test -n "$OBSOLETE_ALL_LINGUAS"; then
129 test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
130 fi
131 ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
132 # Hide the ALL_LINGUAS assigment from automake < 1.5.
133 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
134 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
135 else
136 # The set of available languages was given in configure.in.
137 # Hide the ALL_LINGUAS assigment from automake < 1.5.
138 eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
139 fi
140 # Compute POFILES
141 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
142 # Compute UPDATEPOFILES
143 # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
144 # Compute DUMMYPOFILES
145 # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
146 # Compute GMOFILES
147 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
148 case "$ac_given_srcdir" in
149 .) srcdirpre= ;;
150 *) srcdirpre='$(srcdir)/' ;;
151 esac
152 POFILES=
153 UPDATEPOFILES=
154 DUMMYPOFILES=
155 GMOFILES=
156 for lang in $ALL_LINGUAS; do
157 POFILES="$POFILES $srcdirpre$lang.po"
158 UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
159 DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
160 GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
161 done
162 # CATALOGS depends on both $ac_dir and the user's LINGUAS
163 # environment variable.
164 INST_LINGUAS=
165 if test -n "$ALL_LINGUAS"; then
166 for presentlang in $ALL_LINGUAS; do
167 useit=no
168 if test "%UNSET%" != "$LINGUAS"; then
169 desiredlanguages="$LINGUAS"
170 else
171 desiredlanguages="$ALL_LINGUAS"
172 fi
173 for desiredlang in $desiredlanguages; do
174 # Use the presentlang catalog if desiredlang is
175 # a. equal to presentlang, or
176 # b. a variant of presentlang (because in this case,
177 # presentlang can be used as a fallback for messages
178 # which are not translated in the desiredlang catalog).
179 case "$desiredlang" in
180 "$presentlang"*) useit=yes;;
181 esac
182 done
183 if test $useit = yes; then
184 INST_LINGUAS="$INST_LINGUAS $presentlang"
185 fi
186 done
187 fi
188 CATALOGS=
189 if test -n "$INST_LINGUAS"; then
190 for lang in $INST_LINGUAS; do
191 CATALOGS="$CATALOGS $lang.gmo"
192 done
193 fi
194 test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
195 sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
196 for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
197 if test -f "$f"; then
198 case "$f" in
199 *.orig | *.bak | *~) ;;
200 *) cat "$f" >> "$ac_dir/Makefile" ;;
201 esac
202 fi
203 done
204 fi
205 ;;
206 esac
207 done]],
208 [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
209 # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
210 # from automake < 1.5.
211 eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
212 # Capture the value of LINGUAS because we need it to compute CATALOGS.
213 LINGUAS="${LINGUAS-%UNSET%}"
214 ])
215])
216
217dnl Postprocesses a Makefile in a directory containing PO files.
218AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
219[
220 # When this code is run, in config.status, two variables have already been
221 # set:
222 # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
223 # - LINGUAS is the value of the environment variable LINGUAS at configure
224 # time.
225
226changequote(,)dnl
227 # Adjust a relative srcdir.
228 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
229 ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
230 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
231 # In autoconf-2.13 it is called $ac_given_srcdir.
232 # In autoconf-2.50 it is called $srcdir.
233 test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
234 case "$ac_given_srcdir" in
235 .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
236 /*) top_srcdir="$ac_given_srcdir" ;;
237 *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
238 esac
239
240 # Find a way to echo strings without interpreting backslash.
241 if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
242 gt_echo='echo'
243 else
244 if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
245 gt_echo='printf %s\n'
246 else
247 echo_func () {
248 cat <<EOT
249$*
250EOT
251 }
252 gt_echo='echo_func'
253 fi
254 fi
255
256 # A sed script that extracts the value of VARIABLE from a Makefile.
257 sed_x_variable='
258# Test if the hold space is empty.
259x
260s/P/P/
261x
262ta
263# Yes it was empty. Look if we have the expected variable definition.
264/^[ ]*VARIABLE[ ]*=/{
265 # Seen the first line of the variable definition.
266 s/^[ ]*VARIABLE[ ]*=//
267 ba
268}
269bd
270:a
271# Here we are processing a line from the variable definition.
272# Remove comment, more precisely replace it with a space.
273s/#.*$/ /
274# See if the line ends in a backslash.
275tb
276:b
277s/\\$//
278# Print the line, without the trailing backslash.
279p
280tc
281# There was no trailing backslash. The end of the variable definition is
282# reached. Clear the hold space.
283s/^.*$//
284x
285bd
286:c
287# A trailing backslash means that the variable definition continues in the
288# next line. Put a nonempty string into the hold space to indicate this.
289s/^.*$/P/
290x
291:d
292'
293changequote([,])dnl
294
295 # Set POTFILES to the value of the Makefile variable POTFILES.
296 sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
297 POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
298 # Compute POTFILES_DEPS as
299 # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
300 POTFILES_DEPS=
301 for file in $POTFILES; do
302 POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
303 done
304 POMAKEFILEDEPS=""
305
306 if test -n "$OBSOLETE_ALL_LINGUAS"; then
307 test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
308 fi
309 if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
310 # The LINGUAS file contains the set of available languages.
311 ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
312 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
313 else
314 # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
315 sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
316 ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
317 fi
318 # Hide the ALL_LINGUAS assigment from automake < 1.5.
319 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
320 # Compute POFILES
321 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
322 # Compute UPDATEPOFILES
323 # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
324 # Compute DUMMYPOFILES
325 # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
326 # Compute GMOFILES
327 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
328 # Compute PROPERTIESFILES
329 # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
330 # Compute CLASSFILES
331 # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
332 # Compute QMFILES
333 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
334 # Compute MSGFILES
335 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
336 # Compute RESOURCESDLLFILES
337 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
338 case "$ac_given_srcdir" in
339 .) srcdirpre= ;;
340 *) srcdirpre='$(srcdir)/' ;;
341 esac
342 POFILES=
343 UPDATEPOFILES=
344 DUMMYPOFILES=
345 GMOFILES=
346 PROPERTIESFILES=
347 CLASSFILES=
348 QMFILES=
349 MSGFILES=
350 RESOURCESDLLFILES=
351 for lang in $ALL_LINGUAS; do
352 POFILES="$POFILES $srcdirpre$lang.po"
353 UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
354 DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
355 GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
356 PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
357 CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
358 QMFILES="$QMFILES $srcdirpre$lang.qm"
359 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
360 MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
361 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/'`
362 RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
363 done
364 # CATALOGS depends on both $ac_dir and the user's LINGUAS
365 # environment variable.
366 INST_LINGUAS=
367 if test -n "$ALL_LINGUAS"; then
368 for presentlang in $ALL_LINGUAS; do
369 useit=no
370 if test "%UNSET%" != "$LINGUAS"; then
371 desiredlanguages="$LINGUAS"
372 else
373 desiredlanguages="$ALL_LINGUAS"
374 fi
375 for desiredlang in $desiredlanguages; do
376 # Use the presentlang catalog if desiredlang is
377 # a. equal to presentlang, or
378 # b. a variant of presentlang (because in this case,
379 # presentlang can be used as a fallback for messages
380 # which are not translated in the desiredlang catalog).
381 case "$desiredlang" in
382 "$presentlang"*) useit=yes;;
383 esac
384 done
385 if test $useit = yes; then
386 INST_LINGUAS="$INST_LINGUAS $presentlang"
387 fi
388 done
389 fi
390 CATALOGS=
391 JAVACATALOGS=
392 QTCATALOGS=
393 TCLCATALOGS=
394 CSHARPCATALOGS=
395 if test -n "$INST_LINGUAS"; then
396 for lang in $INST_LINGUAS; do
397 CATALOGS="$CATALOGS $lang.gmo"
398 JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
399 QTCATALOGS="$QTCATALOGS $lang.qm"
400 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
401 TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
402 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/'`
403 CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
404 done
405 fi
406
407 sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
408 if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
409 # Add dependencies that cannot be formulated as a simple suffix rule.
410 for lang in $ALL_LINGUAS; do
411 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
412 cat >> "$ac_file.tmp" <<EOF
413$frobbedlang.msg: $lang.po
414 @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
415 \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
416EOF
417 done
418 fi
419 if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
420 # Add dependencies that cannot be formulated as a simple suffix rule.
421 for lang in $ALL_LINGUAS; do
422 frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
423 cat >> "$ac_file.tmp" <<EOF
424$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
425 @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
426 \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
427EOF
428 done
429 fi
430 if test -n "$POMAKEFILEDEPS"; then
431 cat >> "$ac_file.tmp" <<EOF
432Makefile: $POMAKEFILEDEPS
433EOF
434 fi
435 mv "$ac_file.tmp" "$ac_file"
436])
437
438dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
439AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
440[
441 XGETTEXT_EXTRA_OPTIONS=
442])
443
444dnl Registers an option to be passed to xgettext in the po subdirectory.
445AC_DEFUN([AM_XGETTEXT_OPTION],
446[
447 AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
448 XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
449])
0450
=== added file 'build/autotools/progtest.m4'
--- build/autotools/progtest.m4 1970-01-01 00:00:00 +0000
+++ build/autotools/progtest.m4 2011-06-20 20:11:46 +0000
@@ -0,0 +1,92 @@
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: