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
1=== added file 'ABOUT-NLS'
2--- ABOUT-NLS 1970-01-01 00:00:00 +0000
3+++ ABOUT-NLS 2011-06-20 20:11:46 +0000
4@@ -0,0 +1,1327 @@
5+1 Notes on the Free Translation Project
6+***************************************
7+
8+Free software is going international! The Free Translation Project is
9+a way to get maintainers of free software, translators, and users all
10+together, so that free software will gradually become able to speak many
11+languages. A few packages already provide translations for their
12+messages.
13+
14+ If you found this `ABOUT-NLS' file inside a distribution, you may
15+assume that the distributed package does use GNU `gettext' internally,
16+itself available at your nearest GNU archive site. But you do _not_
17+need to install GNU `gettext' prior to configuring, installing or using
18+this package with messages translated.
19+
20+ Installers will find here some useful hints. These notes also
21+explain how users should proceed for getting the programs to use the
22+available translations. They tell how people wanting to contribute and
23+work on translations can contact the appropriate team.
24+
25+ When reporting bugs in the `intl/' directory or bugs which may be
26+related to internationalization, you should tell about the version of
27+`gettext' which is used. The information can be found in the
28+`intl/VERSION' file, in internationalized packages.
29+
30+1.1 Quick configuration advice
31+==============================
32+
33+If you want to exploit the full power of internationalization, you
34+should configure it using
35+
36+ ./configure --with-included-gettext
37+
38+to force usage of internationalizing routines provided within this
39+package, despite the existence of internationalizing capabilities in the
40+operating system where this package is being installed. So far, only
41+the `gettext' implementation in the GNU C library version 2 provides as
42+many features (such as locale alias, message inheritance, automatic
43+charset conversion or plural form handling) as the implementation here.
44+It is also not possible to offer this additional functionality on top
45+of a `catgets' implementation. Future versions of GNU `gettext' will
46+very likely convey even more functionality. So it might be a good idea
47+to change to GNU `gettext' as soon as possible.
48+
49+ So you need _not_ provide this option if you are using GNU libc 2 or
50+you have installed a recent copy of the GNU gettext package with the
51+included `libintl'.
52+
53+1.2 INSTALL Matters
54+===================
55+
56+Some packages are "localizable" when properly installed; the programs
57+they contain can be made to speak your own native language. Most such
58+packages use GNU `gettext'. Other packages have their own ways to
59+internationalization, predating GNU `gettext'.
60+
61+ By default, this package will be installed to allow translation of
62+messages. It will automatically detect whether the system already
63+provides the GNU `gettext' functions. If not, the included GNU
64+`gettext' library will be used. This library is wholly contained
65+within this package, usually in the `intl/' subdirectory, so prior
66+installation of the GNU `gettext' package is _not_ required.
67+Installers may use special options at configuration time for changing
68+the default behaviour. The commands:
69+
70+ ./configure --with-included-gettext
71+ ./configure --disable-nls
72+
73+will, respectively, bypass any pre-existing `gettext' to use the
74+internationalizing routines provided within this package, or else,
75+_totally_ disable translation of messages.
76+
77+ When you already have GNU `gettext' installed on your system and run
78+configure without an option for your new package, `configure' will
79+probably detect the previously built and installed `libintl.a' file and
80+will decide to use this. This might not be desirable. You should use
81+the more recent version of the GNU `gettext' library. I.e. if the file
82+`intl/VERSION' shows that the library which comes with this package is
83+more recent, you should use
84+
85+ ./configure --with-included-gettext
86+
87+to prevent auto-detection.
88+
89+ The configuration process will not test for the `catgets' function
90+and therefore it will not be used. The reason is that even an
91+emulation of `gettext' on top of `catgets' could not provide all the
92+extensions of the GNU `gettext' library.
93+
94+ Internationalized packages usually have many `po/LL.po' files, where
95+LL gives an ISO 639 two-letter code identifying the language. Unless
96+translations have been forbidden at `configure' time by using the
97+`--disable-nls' switch, all available translations are installed
98+together with the package. However, the environment variable `LINGUAS'
99+may be set, prior to configuration, to limit the installed set.
100+`LINGUAS' should then contain a space separated list of two-letter
101+codes, stating which languages are allowed.
102+
103+1.3 Using This Package
104+======================
105+
106+As a user, if your language has been installed for this package, you
107+only have to set the `LANG' environment variable to the appropriate
108+`LL_CC' combination. If you happen to have the `LC_ALL' or some other
109+`LC_xxx' environment variables set, you should unset them before
110+setting `LANG', otherwise the setting of `LANG' will not have the
111+desired effect. Here `LL' is an ISO 639 two-letter language code, and
112+`CC' is an ISO 3166 two-letter country code. For example, let's
113+suppose that you speak German and live in Germany. At the shell
114+prompt, merely execute `setenv LANG de_DE' (in `csh'),
115+`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
116+This can be done from your `.login' or `.profile' file, once and for
117+all.
118+
119+ You might think that the country code specification is redundant.
120+But in fact, some languages have dialects in different countries. For
121+example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The
122+country code serves to distinguish the dialects.
123+
124+ The locale naming convention of `LL_CC', with `LL' denoting the
125+language and `CC' denoting the country, is the one use on systems based
126+on GNU libc. On other systems, some variations of this scheme are
127+used, such as `LL' or `LL_CC.ENCODING'. You can get the list of
128+locales supported by your system for your language by running the
129+command `locale -a | grep '^LL''.
130+
131+ Not all programs have translations for all languages. By default, an
132+English message is shown in place of a nonexistent translation. If you
133+understand other languages, you can set up a priority list of languages.
134+This is done through a different environment variable, called
135+`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG'
136+for the purpose of message handling, but you still need to have `LANG'
137+set to the primary language; this is required by other parts of the
138+system libraries. For example, some Swedish users who would rather
139+read translations in German than English for when Swedish is not
140+available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
141+
142+ Special advice for Norwegian users: The language code for Norwegian
143+bokma*l changed from `no' to `nb' recently (in 2003). During the
144+transition period, while some message catalogs for this language are
145+installed under `nb' and some older ones under `no', it's recommended
146+for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
147+older translations are used.
148+
149+ In the `LANGUAGE' environment variable, but not in the `LANG'
150+environment variable, `LL_CC' combinations can be abbreviated as `LL'
151+to denote the language's main dialect. For example, `de' is equivalent
152+to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
153+(Portuguese as spoken in Portugal) in this context.
154+
155+1.4 Translating Teams
156+=====================
157+
158+For the Free Translation Project to be a success, we need interested
159+people who like their own language and write it well, and who are also
160+able to synergize with other translators speaking the same language.
161+Each translation team has its own mailing list. The up-to-date list of
162+teams can be found at the Free Translation Project's homepage,
163+`http://translationproject.org/', in the "Teams" area.
164+
165+ If you'd like to volunteer to _work_ at translating messages, you
166+should become a member of the translating team for your own language.
167+The subscribing address is _not_ the same as the list itself, it has
168+`-request' appended. For example, speakers of Swedish can send a
169+message to `sv-request@li.org', having this message body:
170+
171+ subscribe
172+
173+ Keep in mind that team members are expected to participate
174+_actively_ in translations, or at solving translational difficulties,
175+rather than merely lurking around. If your team does not exist yet and
176+you want to start one, or if you are unsure about what to do or how to
177+get started, please write to `coordinator@translationproject.org' to
178+reach the coordinator for all translator teams.
179+
180+ The English team is special. It works at improving and uniformizing
181+the terminology in use. Proven linguistic skills are praised more than
182+programming skills, here.
183+
184+1.5 Available Packages
185+======================
186+
187+Languages are not equally supported in all packages. The following
188+matrix shows the current state of internationalization, as of May 2010.
189+The matrix shows, in regard of each package, for which languages PO
190+files have been submitted to translation coordination, with a
191+translation percentage of at least 50%.
192+
193+ Ready PO files af am ar as ast az be be@latin bg bn_IN bs ca crh
194+ +---------------------------------------------------+
195+ a2ps | [] [] |
196+ aegis | |
197+ ant-phone | |
198+ anubis | |
199+ aspell | [] [] |
200+ bash | |
201+ bfd | |
202+ bibshelf | [] |
203+ binutils | |
204+ bison | |
205+ bison-runtime | [] |
206+ bluez-pin | [] [] |
207+ bombono-dvd | |
208+ buzztard | |
209+ cflow | |
210+ clisp | |
211+ coreutils | [] [] |
212+ cpio | |
213+ cppi | |
214+ cpplib | [] |
215+ cryptsetup | |
216+ dfarc | |
217+ dialog | [] [] |
218+ dico | |
219+ diffutils | [] |
220+ dink | |
221+ doodle | |
222+ e2fsprogs | [] |
223+ enscript | [] |
224+ exif | |
225+ fetchmail | [] |
226+ findutils | [] |
227+ flex | [] |
228+ freedink | |
229+ gas | |
230+ gawk | [] [] |
231+ gcal | [] |
232+ gcc | |
233+ gettext-examples | [] [] [] [] |
234+ gettext-runtime | [] [] [] |
235+ gettext-tools | [] [] |
236+ gip | [] |
237+ gjay | |
238+ gliv | [] |
239+ glunarclock | [] [] |
240+ gnubiff | |
241+ gnucash | [] |
242+ gnuedu | |
243+ gnulib | |
244+ gnunet | |
245+ gnunet-gtk | |
246+ gnutls | |
247+ gold | |
248+ gpe-aerial | |
249+ gpe-beam | |
250+ gpe-bluetooth | |
251+ gpe-calendar | |
252+ gpe-clock | [] |
253+ gpe-conf | |
254+ gpe-contacts | |
255+ gpe-edit | |
256+ gpe-filemanager | |
257+ gpe-go | |
258+ gpe-login | |
259+ gpe-ownerinfo | [] |
260+ gpe-package | |
261+ gpe-sketchbook | |
262+ gpe-su | [] |
263+ gpe-taskmanager | [] |
264+ gpe-timesheet | [] |
265+ gpe-today | [] |
266+ gpe-todo | |
267+ gphoto2 | |
268+ gprof | [] |
269+ gpsdrive | |
270+ gramadoir | |
271+ grep | |
272+ grub | [] [] |
273+ gsasl | |
274+ gss | |
275+ gst-plugins-bad | [] |
276+ gst-plugins-base | [] |
277+ gst-plugins-good | [] |
278+ gst-plugins-ugly | [] |
279+ gstreamer | [] [] [] |
280+ gtick | |
281+ gtkam | [] |
282+ gtkorphan | [] |
283+ gtkspell | [] [] [] |
284+ gutenprint | |
285+ hello | [] |
286+ help2man | |
287+ hylafax | |
288+ idutils | |
289+ indent | [] [] |
290+ iso_15924 | |
291+ iso_3166 | [] [] [] [] [] [] [] [] |
292+ iso_3166_2 | |
293+ iso_4217 | |
294+ iso_639 | [] [] [] [] [] |
295+ iso_639_3 | [] |
296+ jwhois | |
297+ kbd | |
298+ keytouch | [] |
299+ keytouch-editor | |
300+ keytouch-keyboa... | [] |
301+ klavaro | [] |
302+ latrine | |
303+ ld | [] |
304+ leafpad | [] [] |
305+ libc | [] [] |
306+ libexif | () |
307+ libextractor | |
308+ libgnutls | |
309+ libgpewidget | |
310+ libgpg-error | |
311+ libgphoto2 | |
312+ libgphoto2_port | |
313+ libgsasl | |
314+ libiconv | [] |
315+ libidn | |
316+ lifelines | |
317+ liferea | [] [] |
318+ lilypond | |
319+ linkdr | [] |
320+ lordsawar | |
321+ lprng | |
322+ lynx | [] |
323+ m4 | |
324+ mailfromd | |
325+ mailutils | |
326+ make | |
327+ man-db | |
328+ man-db-manpages | |
329+ minicom | |
330+ mkisofs | |
331+ myserver | |
332+ nano | [] [] |
333+ opcodes | |
334+ parted | |
335+ pies | |
336+ popt | |
337+ psmisc | |
338+ pspp | [] |
339+ pwdutils | |
340+ radius | [] |
341+ recode | [] [] |
342+ rosegarden | |
343+ rpm | |
344+ rush | |
345+ sarg | |
346+ screem | |
347+ scrollkeeper | [] [] [] |
348+ sed | [] [] |
349+ sharutils | [] [] |
350+ shishi | |
351+ skencil | |
352+ solfege | |
353+ solfege-manual | |
354+ soundtracker | |
355+ sp | |
356+ sysstat | |
357+ tar | [] |
358+ texinfo | |
359+ tin | |
360+ unicode-han-tra... | |
361+ unicode-transla... | |
362+ util-linux-ng | [] |
363+ vice | |
364+ vmm | |
365+ vorbis-tools | |
366+ wastesedge | |
367+ wdiff | |
368+ wget | [] [] |
369+ wyslij-po | |
370+ xchat | [] [] [] [] |
371+ xdg-user-dirs | [] [] [] [] [] [] [] [] [] |
372+ xkeyboard-config | [] [] [] |
373+ +---------------------------------------------------+
374+ af am ar as ast az be be@latin bg bn_IN bs ca crh
375+ 6 0 2 3 19 1 11 3 28 3 1 38 5
376+
377+ cs da de el en en_GB en_ZA eo es et eu fa fi
378+ +-------------------------------------------------+
379+ a2ps | [] [] [] [] [] [] [] [] |
380+ aegis | [] [] [] |
381+ ant-phone | [] () |
382+ anubis | [] [] [] |
383+ aspell | [] [] [] [] [] |
384+ bash | [] [] [] [] |
385+ bfd | [] [] |
386+ bibshelf | [] [] [] [] |
387+ binutils | [] [] |
388+ bison | [] [] [] |
389+ bison-runtime | [] [] [] [] [] |
390+ bluez-pin | [] [] [] [] [] [] [] |
391+ bombono-dvd | [] [] |
392+ buzztard | [] [] [] |
393+ cflow | [] [] [] |
394+ clisp | [] [] [] [] |
395+ coreutils | [] [] [] [] |
396+ cpio | [] |
397+ cppi | [] |
398+ cpplib | [] [] [] |
399+ cryptsetup | [] |
400+ dfarc | [] [] [] [] |
401+ dialog | [] [] [] [] [] |
402+ dico | |
403+ diffutils | [] [] [] [] [] [] [] |
404+ dink | [] [] [] |
405+ doodle | [] |
406+ e2fsprogs | [] [] [] |
407+ enscript | [] [] [] |
408+ exif | () [] [] [] |
409+ fetchmail | [] [] () [] [] [] |
410+ findutils | [] [] [] [] |
411+ flex | [] [] [] |
412+ freedink | [] [] [] [] |
413+ gas | [] |
414+ gawk | [] [] [] |
415+ gcal | [] |
416+ gcc | [] [] |
417+ gettext-examples | [] [] [] [] [] |
418+ gettext-runtime | [] [] [] [] [] |
419+ gettext-tools | [] [] [] |
420+ gip | [] [] [] [] [] |
421+ gjay | [] [] |
422+ gliv | [] [] [] [] |
423+ glunarclock | [] [] [] |
424+ gnubiff | () |
425+ gnucash | [] () () () () () |
426+ gnuedu | [] [] |
427+ gnulib | [] [] [] |
428+ gnunet | |
429+ gnunet-gtk | [] |
430+ gnutls | [] [] |
431+ gold | [] [] |
432+ gpe-aerial | [] [] [] [] [] |
433+ gpe-beam | [] [] [] [] [] |
434+ gpe-bluetooth | [] [] [] |
435+ gpe-calendar | [] [] |
436+ gpe-clock | [] [] [] [] [] |
437+ gpe-conf | [] [] [] [] |
438+ gpe-contacts | [] [] [] [] |
439+ gpe-edit | [] [] [] |
440+ gpe-filemanager | [] [] [] [] |
441+ gpe-go | [] [] [] [] [] |
442+ gpe-login | [] [] [] |
443+ gpe-ownerinfo | [] [] [] [] [] |
444+ gpe-package | [] [] [] [] |
445+ gpe-sketchbook | [] [] [] [] [] |
446+ gpe-su | [] [] [] [] [] |
447+ gpe-taskmanager | [] [] [] [] [] |
448+ gpe-timesheet | [] [] [] [] [] |
449+ gpe-today | [] [] [] [] [] |
450+ gpe-todo | [] [] [] [] |
451+ gphoto2 | [] [] () [] [] [] [] |
452+ gprof | [] [] [] [] |
453+ gpsdrive | [] [] [] |
454+ gramadoir | [] [] [] |
455+ grep | [] [] |
456+ grub | [] [] [] |
457+ gsasl | [] [] |
458+ gss | [] |
459+ gst-plugins-bad | [] [] [] [] [] [] |
460+ gst-plugins-base | [] [] [] [] [] [] |
461+ gst-plugins-good | [] [] [] [] [] [] [] |
462+ gst-plugins-ugly | [] [] [] [] [] [] [] |
463+ gstreamer | [] [] [] [] [] [] |
464+ gtick | [] () [] [] |
465+ gtkam | [] [] () [] [] |
466+ gtkorphan | [] [] [] [] |
467+ gtkspell | [] [] [] [] [] [] [] [] |
468+ gutenprint | [] [] [] [] |
469+ hello | [] [] [] [] [] |
470+ help2man | [] [] |
471+ hylafax | [] [] |
472+ idutils | [] [] [] |
473+ indent | [] [] [] [] [] [] [] [] |
474+ iso_15924 | [] () [] [] [] |
475+ iso_3166 | [] [] [] () [] [] [] () [] |
476+ iso_3166_2 | () |
477+ iso_4217 | [] [] [] () [] [] [] |
478+ iso_639 | [] [] [] () [] [] [] |
479+ iso_639_3 | |
480+ jwhois | [] [] |
481+ kbd | [] [] [] [] [] |
482+ keytouch | [] [] [] |
483+ keytouch-editor | [] [] [] |
484+ keytouch-keyboa... | [] [] |
485+ klavaro | [] [] [] [] |
486+ latrine | [] () [] |
487+ ld | [] [] [] |
488+ leafpad | [] [] [] [] [] [] [] |
489+ libc | [] [] [] [] [] |
490+ libexif | [] [] () |
491+ libextractor | |
492+ libgnutls | [] |
493+ libgpewidget | [] [] [] |
494+ libgpg-error | [] [] |
495+ libgphoto2 | [] () |
496+ libgphoto2_port | [] () [] |
497+ libgsasl | [] |
498+ libiconv | [] [] [] [] [] [] |
499+ libidn | [] [] [] [] |
500+ lifelines | [] () |
501+ liferea | [] [] [] [] [] |
502+ lilypond | [] [] [] [] |
503+ linkdr | [] [] [] [] |
504+ lordsawar | [] |
505+ lprng | |
506+ lynx | [] [] [] [] |
507+ m4 | [] [] [] [] [] |
508+ mailfromd | |
509+ mailutils | [] |
510+ make | [] [] [] [] |
511+ man-db | |
512+ man-db-manpages | |
513+ minicom | [] [] [] [] [] |
514+ mkisofs | [] |
515+ myserver | |
516+ nano | [] [] [] [] |
517+ opcodes | [] [] [] |
518+ parted | [] [] |
519+ pies | |
520+ popt | [] [] [] [] [] [] |
521+ psmisc | [] [] [] [] |
522+ pspp | [] |
523+ pwdutils | [] |
524+ radius | [] |
525+ recode | [] [] [] [] [] [] [] |
526+ rosegarden | () () () () |
527+ rpm | [] [] [] |
528+ rush | |
529+ sarg | |
530+ screem | |
531+ scrollkeeper | [] [] [] [] [] [] |
532+ sed | [] [] [] [] [] [] [] |
533+ sharutils | [] [] [] [] [] |
534+ shishi | |
535+ skencil | [] () [] |
536+ solfege | [] [] [] [] |
537+ solfege-manual | [] [] |
538+ soundtracker | [] [] [] |
539+ sp | [] |
540+ sysstat | [] [] [] [] |
541+ tar | [] [] [] [] [] |
542+ texinfo | [] [] [] |
543+ tin | [] [] |
544+ unicode-han-tra... | |
545+ unicode-transla... | |
546+ util-linux-ng | [] [] [] [] [] |
547+ vice | () () |
548+ vmm | [] |
549+ vorbis-tools | [] [] |
550+ wastesedge | [] |
551+ wdiff | [] [] [] |
552+ wget | [] [] [] [] |
553+ wyslij-po | [] |
554+ xchat | [] [] [] [] [] [] |
555+ xdg-user-dirs | [] [] [] [] [] [] [] [] [] |
556+ xkeyboard-config | [] [] [] [] [] [] |
557+ +-------------------------------------------------+
558+ cs da de el en en_GB en_ZA eo es et eu fa fi
559+ 64 105 117 18 1 8 0 28 89 18 19 0 104
560+
561+ fr ga gl gu he hi hr hu hy id is it ja ka kn
562+ +------------------------------------------------+
563+ a2ps | [] [] [] |
564+ aegis | [] [] |
565+ ant-phone | [] [] |
566+ anubis | [] [] [] |
567+ aspell | [] [] [] [] |
568+ bash | [] [] [] |
569+ bfd | [] [] |
570+ bibshelf | [] [] [] [] |
571+ binutils | [] [] |
572+ bison | [] [] [] |
573+ bison-runtime | [] [] [] [] [] |
574+ bluez-pin | [] [] [] [] [] [] [] |
575+ bombono-dvd | |
576+ buzztard | [] |
577+ cflow | [] [] |
578+ clisp | [] |
579+ coreutils | [] [] [] [] [] |
580+ cpio | [] [] [] |
581+ cppi | [] |
582+ cpplib | [] [] |
583+ cryptsetup | [] [] [] |
584+ dfarc | [] [] |
585+ dialog | [] [] [] [] [] [] [] |
586+ dico | |
587+ diffutils | [] [] [] [] [] [] [] [] |
588+ dink | [] |
589+ doodle | [] [] |
590+ e2fsprogs | [] [] |
591+ enscript | [] [] [] [] |
592+ exif | [] [] [] [] [] |
593+ fetchmail | [] [] [] [] |
594+ findutils | [] [] [] [] [] |
595+ flex | [] [] |
596+ freedink | [] [] |
597+ gas | [] [] |
598+ gawk | [] [] [] [] () [] |
599+ gcal | [] |
600+ gcc | [] |
601+ gettext-examples | [] [] [] [] [] [] |
602+ gettext-runtime | [] [] [] [] [] |
603+ gettext-tools | [] [] [] [] |
604+ gip | [] [] [] [] [] |
605+ gjay | |
606+ gliv | () |
607+ glunarclock | [] [] [] |
608+ gnubiff | () [] () |
609+ gnucash | () () () () [] |
610+ gnuedu | [] [] |
611+ gnulib | [] [] [] [] [] |
612+ gnunet | |
613+ gnunet-gtk | [] |
614+ gnutls | [] [] |
615+ gold | [] |
616+ gpe-aerial | [] [] |
617+ gpe-beam | [] [] [] |
618+ gpe-bluetooth | [] [] [] |
619+ gpe-calendar | [] |
620+ gpe-clock | [] [] [] [] |
621+ gpe-conf | [] [] [] |
622+ gpe-contacts | [] [] [] |
623+ gpe-edit | [] [] |
624+ gpe-filemanager | [] [] [] |
625+ gpe-go | [] [] [] [] |
626+ gpe-login | [] [] |
627+ gpe-ownerinfo | [] [] [] [] |
628+ gpe-package | [] [] |
629+ gpe-sketchbook | [] [] [] |
630+ gpe-su | [] [] [] [] [] |
631+ gpe-taskmanager | [] [] [] [] |
632+ gpe-timesheet | [] [] [] [] |
633+ gpe-today | [] [] [] [] [] [] |
634+ gpe-todo | [] [] |
635+ gphoto2 | [] [] [] [] [] |
636+ gprof | [] [] [] |
637+ gpsdrive | [] [] [] |
638+ gramadoir | [] [] [] |
639+ grep | [] |
640+ grub | [] [] [] |
641+ gsasl | [] [] [] [] |
642+ gss | [] [] [] [] |
643+ gst-plugins-bad | [] [] [] [] |
644+ gst-plugins-base | [] [] [] [] [] |
645+ gst-plugins-good | [] [] [] [] [] |
646+ gst-plugins-ugly | [] [] [] [] [] |
647+ gstreamer | [] [] [] [] |
648+ gtick | [] [] [] [] |
649+ gtkam | [] [] [] [] [] |
650+ gtkorphan | [] [] [] |
651+ gtkspell | [] [] [] [] [] [] [] [] |
652+ gutenprint | [] [] [] |
653+ hello | [] [] |
654+ help2man | [] |
655+ hylafax | [] |
656+ idutils | [] [] [] [] [] |
657+ indent | [] [] [] [] [] [] [] |
658+ iso_15924 | () [] [] |
659+ iso_3166 | () [] [] [] [] [] [] [] [] [] [] |
660+ iso_3166_2 | () [] [] [] |
661+ iso_4217 | () [] [] [] [] |
662+ iso_639 | () [] [] [] [] [] [] [] |
663+ iso_639_3 | () [] [] |
664+ jwhois | [] [] [] [] |
665+ kbd | [] [] |
666+ keytouch | [] [] [] [] [] |
667+ keytouch-editor | [] [] [] [] |
668+ keytouch-keyboa... | [] [] [] [] |
669+ klavaro | [] [] |
670+ latrine | [] [] |
671+ ld | [] [] [] |
672+ leafpad | [] [] [] [] [] [] () |
673+ libc | [] [] [] [] |
674+ libexif | |
675+ libextractor | |
676+ libgnutls | [] [] |
677+ libgpewidget | [] [] [] |
678+ libgpg-error | [] [] |
679+ libgphoto2 | [] [] [] |
680+ libgphoto2_port | [] [] [] |
681+ libgsasl | [] [] [] [] |
682+ libiconv | [] [] [] [] [] |
683+ libidn | [] [] [] |
684+ lifelines | () |
685+ liferea | [] [] [] [] |
686+ lilypond | [] |
687+ linkdr | [] [] [] [] |
688+ lordsawar | |
689+ lprng | [] |
690+ lynx | [] [] [] [] [] |
691+ m4 | [] [] [] [] [] |
692+ mailfromd | |
693+ mailutils | [] [] |
694+ make | [] [] [] [] [] [] [] [] |
695+ man-db | [] [] |
696+ man-db-manpages | [] |
697+ minicom | [] [] [] [] |
698+ mkisofs | [] [] [] |
699+ myserver | |
700+ nano | [] [] [] [] [] |
701+ opcodes | [] [] [] |
702+ parted | [] [] [] [] |
703+ pies | |
704+ popt | [] [] [] [] [] [] [] [] |
705+ psmisc | [] [] |
706+ pspp | |
707+ pwdutils | [] [] |
708+ radius | [] [] |
709+ recode | [] [] [] [] [] [] [] |
710+ rosegarden | () () () () |
711+ rpm | [] [] |
712+ rush | |
713+ sarg | [] |
714+ screem | [] [] |
715+ scrollkeeper | [] [] [] |
716+ sed | [] [] [] [] [] [] [] |
717+ sharutils | [] [] [] [] [] [] |
718+ shishi | [] |
719+ skencil | [] |
720+ solfege | [] [] [] |
721+ solfege-manual | [] [] |
722+ soundtracker | [] [] |
723+ sp | [] () |
724+ sysstat | [] [] [] [] |
725+ tar | [] [] [] [] [] [] |
726+ texinfo | [] [] [] [] |
727+ tin | [] |
728+ unicode-han-tra... | |
729+ unicode-transla... | [] [] |
730+ util-linux-ng | [] [] [] [] [] |
731+ vice | () () () |
732+ vmm | [] |
733+ vorbis-tools | [] |
734+ wastesedge | () () |
735+ wdiff | |
736+ wget | [] [] [] [] [] [] [] |
737+ wyslij-po | [] [] |
738+ xchat | [] [] [] [] [] [] [] [] |
739+ xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] |
740+ xkeyboard-config | [] [] [] [] |
741+ +------------------------------------------------+
742+ fr ga gl gu he hi hr hu hy id is it ja ka kn
743+ 121 53 20 4 8 2 5 53 2 120 5 83 66 0 4
744+
745+ ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
746+ +-----------------------------------------------+
747+ a2ps | [] |
748+ aegis | |
749+ ant-phone | |
750+ anubis | [] [] |
751+ aspell | [] |
752+ bash | |
753+ bfd | |
754+ bibshelf | [] [] |
755+ binutils | |
756+ bison | [] |
757+ bison-runtime | [] [] [] [] [] |
758+ bluez-pin | [] [] [] [] [] |
759+ bombono-dvd | |
760+ buzztard | |
761+ cflow | |
762+ clisp | |
763+ coreutils | [] |
764+ cpio | |
765+ cppi | |
766+ cpplib | |
767+ cryptsetup | |
768+ dfarc | [] |
769+ dialog | [] [] [] [] [] |
770+ dico | |
771+ diffutils | [] [] |
772+ dink | |
773+ doodle | |
774+ e2fsprogs | |
775+ enscript | |
776+ exif | [] |
777+ fetchmail | |
778+ findutils | |
779+ flex | |
780+ freedink | [] |
781+ gas | |
782+ gawk | |
783+ gcal | |
784+ gcc | |
785+ gettext-examples | [] [] [] [] |
786+ gettext-runtime | [] |
787+ gettext-tools | [] |
788+ gip | [] [] |
789+ gjay | |
790+ gliv | |
791+ glunarclock | [] |
792+ gnubiff | |
793+ gnucash | () () () () |
794+ gnuedu | |
795+ gnulib | |
796+ gnunet | |
797+ gnunet-gtk | |
798+ gnutls | [] |
799+ gold | |
800+ gpe-aerial | [] |
801+ gpe-beam | [] |
802+ gpe-bluetooth | [] [] |
803+ gpe-calendar | [] |
804+ gpe-clock | [] [] [] [] [] |
805+ gpe-conf | [] [] |
806+ gpe-contacts | [] [] |
807+ gpe-edit | [] |
808+ gpe-filemanager | [] [] |
809+ gpe-go | [] [] [] |
810+ gpe-login | [] |
811+ gpe-ownerinfo | [] [] |
812+ gpe-package | [] [] |
813+ gpe-sketchbook | [] [] |
814+ gpe-su | [] [] [] [] [] [] |
815+ gpe-taskmanager | [] [] [] [] [] [] |
816+ gpe-timesheet | [] [] |
817+ gpe-today | [] [] [] [] |
818+ gpe-todo | [] [] |
819+ gphoto2 | |
820+ gprof | [] |
821+ gpsdrive | |
822+ gramadoir | |
823+ grep | |
824+ grub | |
825+ gsasl | |
826+ gss | |
827+ gst-plugins-bad | [] [] |
828+ gst-plugins-base | [] [] |
829+ gst-plugins-good | [] [] |
830+ gst-plugins-ugly | [] [] [] [] [] |
831+ gstreamer | |
832+ gtick | |
833+ gtkam | [] |
834+ gtkorphan | [] [] |
835+ gtkspell | [] [] [] [] [] [] [] |
836+ gutenprint | |
837+ hello | [] [] [] |
838+ help2man | |
839+ hylafax | |
840+ idutils | |
841+ indent | |
842+ iso_15924 | [] [] |
843+ iso_3166 | [] [] () [] [] [] [] [] |
844+ iso_3166_2 | |
845+ iso_4217 | [] [] |
846+ iso_639 | [] [] |
847+ iso_639_3 | [] |
848+ jwhois | [] |
849+ kbd | |
850+ keytouch | [] |
851+ keytouch-editor | [] |
852+ keytouch-keyboa... | [] |
853+ klavaro | [] |
854+ latrine | [] |
855+ ld | |
856+ leafpad | [] [] [] |
857+ libc | [] |
858+ libexif | |
859+ libextractor | |
860+ libgnutls | [] |
861+ libgpewidget | [] [] |
862+ libgpg-error | |
863+ libgphoto2 | |
864+ libgphoto2_port | |
865+ libgsasl | |
866+ libiconv | |
867+ libidn | |
868+ lifelines | |
869+ liferea | |
870+ lilypond | |
871+ linkdr | |
872+ lordsawar | |
873+ lprng | |
874+ lynx | |
875+ m4 | |
876+ mailfromd | |
877+ mailutils | |
878+ make | [] |
879+ man-db | |
880+ man-db-manpages | |
881+ minicom | [] |
882+ mkisofs | |
883+ myserver | |
884+ nano | [] [] |
885+ opcodes | |
886+ parted | |
887+ pies | |
888+ popt | [] [] [] |
889+ psmisc | |
890+ pspp | |
891+ pwdutils | |
892+ radius | |
893+ recode | |
894+ rosegarden | |
895+ rpm | |
896+ rush | |
897+ sarg | |
898+ screem | |
899+ scrollkeeper | [] [] |
900+ sed | |
901+ sharutils | |
902+ shishi | |
903+ skencil | |
904+ solfege | [] |
905+ solfege-manual | |
906+ soundtracker | |
907+ sp | |
908+ sysstat | [] |
909+ tar | [] |
910+ texinfo | [] |
911+ tin | |
912+ unicode-han-tra... | |
913+ unicode-transla... | |
914+ util-linux-ng | |
915+ vice | |
916+ vmm | |
917+ vorbis-tools | |
918+ wastesedge | |
919+ wdiff | |
920+ wget | [] |
921+ wyslij-po | |
922+ xchat | [] [] [] |
923+ xdg-user-dirs | [] [] [] [] [] [] [] [] |
924+ xkeyboard-config | [] [] [] |
925+ +-----------------------------------------------+
926+ ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
927+ 20 5 10 1 12 48 4 2 2 4 24 10 19 3 1
928+
929+ nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr
930+ +---------------------------------------------------+
931+ a2ps | [] [] [] [] [] [] [] [] |
932+ aegis | [] [] [] |
933+ ant-phone | [] [] |
934+ anubis | [] [] [] |
935+ aspell | [] [] [] [] [] |
936+ bash | [] [] |
937+ bfd | [] |
938+ bibshelf | [] [] |
939+ binutils | [] [] |
940+ bison | [] [] [] |
941+ bison-runtime | [] [] [] [] [] [] [] |
942+ bluez-pin | [] [] [] [] [] [] [] [] |
943+ bombono-dvd | [] () |
944+ buzztard | [] [] |
945+ cflow | [] |
946+ clisp | [] [] |
947+ coreutils | [] [] [] [] [] [] |
948+ cpio | [] [] [] |
949+ cppi | [] |
950+ cpplib | [] |
951+ cryptsetup | [] |
952+ dfarc | [] |
953+ dialog | [] [] [] [] |
954+ dico | [] |
955+ diffutils | [] [] [] [] [] [] |
956+ dink | () |
957+ doodle | [] [] |
958+ e2fsprogs | [] [] |
959+ enscript | [] [] [] [] [] |
960+ exif | [] [] [] () [] |
961+ fetchmail | [] [] [] [] |
962+ findutils | [] [] [] [] [] |
963+ flex | [] [] [] [] [] |
964+ freedink | [] [] |
965+ gas | |
966+ gawk | [] [] [] [] |
967+ gcal | |
968+ gcc | [] |
969+ gettext-examples | [] [] [] [] [] [] [] [] |
970+ gettext-runtime | [] [] [] [] [] [] [] [] [] |
971+ gettext-tools | [] [] [] [] [] [] |
972+ gip | [] [] [] [] [] |
973+ gjay | |
974+ gliv | [] [] [] [] [] [] |
975+ glunarclock | [] [] [] [] [] |
976+ gnubiff | [] () |
977+ gnucash | [] () () () |
978+ gnuedu | [] |
979+ gnulib | [] [] [] [] |
980+ gnunet | |
981+ gnunet-gtk | |
982+ gnutls | [] [] |
983+ gold | |
984+ gpe-aerial | [] [] [] [] [] [] [] |
985+ gpe-beam | [] [] [] [] [] [] [] |
986+ gpe-bluetooth | [] [] |
987+ gpe-calendar | [] [] [] [] |
988+ gpe-clock | [] [] [] [] [] [] [] [] |
989+ gpe-conf | [] [] [] [] [] [] [] |
990+ gpe-contacts | [] [] [] [] [] |
991+ gpe-edit | [] [] [] |
992+ gpe-filemanager | [] [] [] |
993+ gpe-go | [] [] [] [] [] [] [] [] |
994+ gpe-login | [] [] |
995+ gpe-ownerinfo | [] [] [] [] [] [] [] [] |
996+ gpe-package | [] [] |
997+ gpe-sketchbook | [] [] [] [] [] [] [] |
998+ gpe-su | [] [] [] [] [] [] [] [] |
999+ gpe-taskmanager | [] [] [] [] [] [] [] [] |
1000+ gpe-timesheet | [] [] [] [] [] [] [] [] |
1001+ gpe-today | [] [] [] [] [] [] [] [] |
1002+ gpe-todo | [] [] [] [] [] |
1003+ gphoto2 | [] [] [] [] [] [] [] [] |
1004+ gprof | [] [] [] |
1005+ gpsdrive | [] [] |
1006+ gramadoir | [] [] |
1007+ grep | [] [] [] [] |
1008+ grub | [] [] [] |
1009+ gsasl | [] [] [] [] |
1010+ gss | [] [] [] |
1011+ gst-plugins-bad | [] [] [] [] [] |
1012+ gst-plugins-base | [] [] [] [] [] |
1013+ gst-plugins-good | [] [] [] [] [] |
1014+ gst-plugins-ugly | [] [] [] [] [] [] |
1015+ gstreamer | [] [] [] [] [] |
1016+ gtick | [] [] [] |
1017+ gtkam | [] [] [] [] [] [] |
1018+ gtkorphan | [] |
1019+ gtkspell | [] [] [] [] [] [] [] [] [] [] |
1020+ gutenprint | [] [] |
1021+ hello | [] [] [] [] |
1022+ help2man | [] [] |
1023+ hylafax | [] |
1024+ idutils | [] [] [] [] [] |
1025+ indent | [] [] [] [] [] [] [] |
1026+ iso_15924 | [] [] [] [] |
1027+ iso_3166 | [] [] [] [] [] () [] [] [] [] [] [] [] [] |
1028+ iso_3166_2 | [] [] [] |
1029+ iso_4217 | [] [] [] [] [] [] [] [] |
1030+ iso_639 | [] [] [] [] [] [] [] [] [] |
1031+ iso_639_3 | [] [] |
1032+ jwhois | [] [] [] [] |
1033+ kbd | [] [] [] |
1034+ keytouch | [] [] [] |
1035+ keytouch-editor | [] [] [] |
1036+ keytouch-keyboa... | [] [] [] |
1037+ klavaro | [] [] |
1038+ latrine | [] [] |
1039+ ld | |
1040+ leafpad | [] [] [] [] [] [] [] [] [] |
1041+ libc | [] [] [] [] |
1042+ libexif | [] [] () [] |
1043+ libextractor | |
1044+ libgnutls | [] [] |
1045+ libgpewidget | [] [] [] |
1046+ libgpg-error | [] [] |
1047+ libgphoto2 | [] [] |
1048+ libgphoto2_port | [] [] [] [] |
1049+ libgsasl | [] [] [] [] [] |
1050+ libiconv | [] [] [] [] [] |
1051+ libidn | [] [] |
1052+ lifelines | [] [] |
1053+ liferea | [] [] [] [] [] () () [] |
1054+ lilypond | [] |
1055+ linkdr | [] [] [] |
1056+ lordsawar | |
1057+ lprng | [] |
1058+ lynx | [] [] [] |
1059+ m4 | [] [] [] [] [] |
1060+ mailfromd | [] |
1061+ mailutils | [] |
1062+ make | [] [] [] [] |
1063+ man-db | [] [] [] |
1064+ man-db-manpages | [] [] [] |
1065+ minicom | [] [] [] [] |
1066+ mkisofs | [] [] [] |
1067+ myserver | |
1068+ nano | [] [] [] [] |
1069+ opcodes | [] [] |
1070+ parted | [] [] [] [] |
1071+ pies | [] |
1072+ popt | [] [] [] [] |
1073+ psmisc | [] [] [] |
1074+ pspp | [] [] |
1075+ pwdutils | [] |
1076+ radius | [] [] [] |
1077+ recode | [] [] [] [] [] [] [] [] |
1078+ rosegarden | () () |
1079+ rpm | [] [] [] |
1080+ rush | [] [] |
1081+ sarg | |
1082+ screem | |
1083+ scrollkeeper | [] [] [] [] [] [] [] [] |
1084+ sed | [] [] [] [] [] [] [] [] [] |
1085+ sharutils | [] [] [] [] |
1086+ shishi | [] |
1087+ skencil | [] [] |
1088+ solfege | [] [] [] [] |
1089+ solfege-manual | [] [] [] |
1090+ soundtracker | [] |
1091+ sp | |
1092+ sysstat | [] [] [] [] |
1093+ tar | [] [] [] [] |
1094+ texinfo | [] [] [] [] |
1095+ tin | [] |
1096+ unicode-han-tra... | |
1097+ unicode-transla... | |
1098+ util-linux-ng | [] [] [] [] [] |
1099+ vice | [] |
1100+ vmm | [] |
1101+ vorbis-tools | [] [] |
1102+ wastesedge | [] |
1103+ wdiff | [] [] |
1104+ wget | [] [] [] [] [] [] [] |
1105+ wyslij-po | [] [] [] |
1106+ xchat | [] [] [] [] [] [] [] [] [] |
1107+ xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] [] |
1108+ xkeyboard-config | [] [] [] [] [] |
1109+ +---------------------------------------------------+
1110+ nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr
1111+ 135 10 4 7 105 1 29 61 47 91 3 55 47 8 37
1112+
1113+ sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW
1114+ +---------------------------------------------------+
1115+ a2ps | [] [] [] [] [] | 27
1116+ aegis | [] | 9
1117+ ant-phone | [] [] [] [] | 9
1118+ anubis | [] [] [] [] | 15
1119+ aspell | [] [] [] | 20
1120+ bash | [] [] | 11
1121+ bfd | [] | 6
1122+ bibshelf | [] [] [] | 16
1123+ binutils | [] [] | 8
1124+ bison | [] [] | 12
1125+ bison-runtime | [] [] [] [] [] [] | 29
1126+ bluez-pin | [] [] [] [] [] [] [] [] | 37
1127+ bombono-dvd | [] | 4
1128+ buzztard | [] | 7
1129+ cflow | [] [] [] | 9
1130+ clisp | | 10
1131+ coreutils | [] [] [] [] | 22
1132+ cpio | [] [] [] [] [] [] | 13
1133+ cppi | [] [] | 5
1134+ cpplib | [] [] [] [] [] [] | 13
1135+ cryptsetup | [] [] | 7
1136+ dfarc | [] | 9
1137+ dialog | [] [] [] [] [] [] [] | 30
1138+ dico | [] | 2
1139+ diffutils | [] [] [] [] [] [] | 30
1140+ dink | | 4
1141+ doodle | [] [] | 7
1142+ e2fsprogs | [] [] [] | 11
1143+ enscript | [] [] [] [] | 17
1144+ exif | [] [] [] | 16
1145+ fetchmail | [] [] [] | 17
1146+ findutils | [] [] [] [] [] | 20
1147+ flex | [] [] [] [] | 15
1148+ freedink | [] | 10
1149+ gas | [] | 4
1150+ gawk | [] [] [] [] | 18
1151+ gcal | [] [] | 5
1152+ gcc | [] [] [] | 7
1153+ gettext-examples | [] [] [] [] [] [] [] | 34
1154+ gettext-runtime | [] [] [] [] [] [] [] | 30
1155+ gettext-tools | [] [] [] [] [] [] | 22
1156+ gip | [] [] [] [] | 22
1157+ gjay | [] | 3
1158+ gliv | [] [] [] | 14
1159+ glunarclock | [] [] [] [] [] | 19
1160+ gnubiff | [] [] | 4
1161+ gnucash | () [] () () | 9
1162+ gnuedu | [] [] | 7
1163+ gnulib | [] [] [] [] | 16
1164+ gnunet | [] | 1
1165+ gnunet-gtk | [] [] [] | 5
1166+ gnutls | [] [] [] | 10
1167+ gold | [] | 4
1168+ gpe-aerial | [] [] [] | 18
1169+ gpe-beam | [] [] [] | 19
1170+ gpe-bluetooth | [] [] [] | 13
1171+ gpe-calendar | [] [] [] [] | 12
1172+ gpe-clock | [] [] [] [] [] | 28
1173+ gpe-conf | [] [] [] [] | 20
1174+ gpe-contacts | [] [] [] | 17
1175+ gpe-edit | [] [] [] | 12
1176+ gpe-filemanager | [] [] [] [] | 16
1177+ gpe-go | [] [] [] [] [] | 25
1178+ gpe-login | [] [] [] | 11
1179+ gpe-ownerinfo | [] [] [] [] [] | 25
1180+ gpe-package | [] [] [] | 13
1181+ gpe-sketchbook | [] [] [] | 20
1182+ gpe-su | [] [] [] [] [] | 30
1183+ gpe-taskmanager | [] [] [] [] [] | 29
1184+ gpe-timesheet | [] [] [] [] [] | 25
1185+ gpe-today | [] [] [] [] [] [] | 30
1186+ gpe-todo | [] [] [] [] | 17
1187+ gphoto2 | [] [] [] [] [] | 24
1188+ gprof | [] [] [] | 15
1189+ gpsdrive | [] [] [] | 11
1190+ gramadoir | [] [] [] | 11
1191+ grep | [] [] [] | 10
1192+ grub | [] [] [] | 14
1193+ gsasl | [] [] [] [] | 14
1194+ gss | [] [] [] | 11
1195+ gst-plugins-bad | [] [] [] [] | 22
1196+ gst-plugins-base | [] [] [] [] [] | 24
1197+ gst-plugins-good | [] [] [] [] [] | 25
1198+ gst-plugins-ugly | [] [] [] [] [] | 29
1199+ gstreamer | [] [] [] [] | 22
1200+ gtick | [] [] [] | 13
1201+ gtkam | [] [] [] | 20
1202+ gtkorphan | [] [] [] | 14
1203+ gtkspell | [] [] [] [] [] [] [] [] [] | 45
1204+ gutenprint | [] | 10
1205+ hello | [] [] [] [] [] [] | 21
1206+ help2man | [] [] | 7
1207+ hylafax | [] | 5
1208+ idutils | [] [] [] [] | 17
1209+ indent | [] [] [] [] [] [] | 30
1210+ iso_15924 | () [] () [] [] | 16
1211+ iso_3166 | [] [] () [] [] () [] [] [] () | 53
1212+ iso_3166_2 | () [] () [] | 9
1213+ iso_4217 | [] () [] [] () [] [] | 26
1214+ iso_639 | [] [] [] () [] () [] [] [] [] | 38
1215+ iso_639_3 | [] () | 8
1216+ jwhois | [] [] [] [] [] | 16
1217+ kbd | [] [] [] [] [] | 15
1218+ keytouch | [] [] [] | 16
1219+ keytouch-editor | [] [] [] | 14
1220+ keytouch-keyboa... | [] [] [] | 14
1221+ klavaro | [] | 11
1222+ latrine | [] [] [] | 10
1223+ ld | [] [] [] [] | 11
1224+ leafpad | [] [] [] [] [] [] | 33
1225+ libc | [] [] [] [] [] | 21
1226+ libexif | [] () | 6
1227+ libextractor | [] | 1
1228+ libgnutls | [] [] [] | 9
1229+ libgpewidget | [] [] [] | 14
1230+ libgpg-error | [] [] [] | 9
1231+ libgphoto2 | [] [] | 8
1232+ libgphoto2_port | [] [] [] [] | 13
1233+ libgsasl | [] [] [] | 13
1234+ libiconv | [] [] [] [] | 21
1235+ libidn | () [] [] | 11
1236+ lifelines | [] | 4
1237+ liferea | [] [] [] | 21
1238+ lilypond | [] | 7
1239+ linkdr | [] [] [] [] [] | 17
1240+ lordsawar | | 1
1241+ lprng | [] | 3
1242+ lynx | [] [] [] [] | 17
1243+ m4 | [] [] [] [] | 19
1244+ mailfromd | [] [] | 3
1245+ mailutils | [] | 5
1246+ make | [] [] [] [] | 21
1247+ man-db | [] [] [] | 8
1248+ man-db-manpages | | 4
1249+ minicom | [] [] | 16
1250+ mkisofs | [] [] | 9
1251+ myserver | | 0
1252+ nano | [] [] [] [] | 21
1253+ opcodes | [] [] [] | 11
1254+ parted | [] [] [] [] [] | 15
1255+ pies | [] [] | 3
1256+ popt | [] [] [] [] [] [] | 27
1257+ psmisc | [] [] | 11
1258+ pspp | | 4
1259+ pwdutils | [] [] | 6
1260+ radius | [] [] | 9
1261+ recode | [] [] [] [] | 28
1262+ rosegarden | () | 0
1263+ rpm | [] [] [] | 11
1264+ rush | [] [] | 4
1265+ sarg | | 1
1266+ screem | [] | 3
1267+ scrollkeeper | [] [] [] [] [] | 27
1268+ sed | [] [] [] [] [] | 30
1269+ sharutils | [] [] [] [] [] | 22
1270+ shishi | [] | 3
1271+ skencil | [] [] | 7
1272+ solfege | [] [] [] [] | 16
1273+ solfege-manual | [] | 8
1274+ soundtracker | [] [] [] | 9
1275+ sp | [] | 3
1276+ sysstat | [] [] | 15
1277+ tar | [] [] [] [] [] [] | 23
1278+ texinfo | [] [] [] [] | 16
1279+ tin | | 4
1280+ unicode-han-tra... | | 0
1281+ unicode-transla... | | 2
1282+ util-linux-ng | [] [] [] [] | 20
1283+ vice | () () | 1
1284+ vmm | [] | 4
1285+ vorbis-tools | [] | 6
1286+ wastesedge | | 2
1287+ wdiff | [] [] | 7
1288+ wget | [] [] [] [] [] | 26
1289+ wyslij-po | [] [] | 8
1290+ xchat | [] [] [] [] [] [] | 36
1291+ xdg-user-dirs | [] [] [] [] [] [] [] [] [] | 60
1292+ xkeyboard-config | [] [] [] [] | 25
1293+ +---------------------------------------------------+
1294+ 84 teams sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW
1295+ 178 domains 119 1 3 2 0 10 66 50 155 17 97 7 41 2610
1296+
1297+ Some counters in the preceding matrix are higher than the number of
1298+visible blocks let us expect. This is because a few extra PO files are
1299+used for implementing regional variants of languages, or language
1300+dialects.
1301+
1302+ For a PO file in the matrix above to be effective, the package to
1303+which it applies should also have been internationalized and
1304+distributed as such by its maintainer. There might be an observable
1305+lag between the mere existence a PO file and its wide availability in a
1306+distribution.
1307+
1308+ If May 2010 seems to be old, you may fetch a more recent copy of
1309+this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date
1310+matrix with full percentage details can be found at
1311+`http://translationproject.org/extra/matrix.html'.
1312+
1313+1.6 Using `gettext' in new packages
1314+===================================
1315+
1316+If you are writing a freely available program and want to
1317+internationalize it you are welcome to use GNU `gettext' in your
1318+package. Of course you have to respect the GNU Library General Public
1319+License which covers the use of the GNU `gettext' library. This means
1320+in particular that even non-free programs can use `libintl' as a shared
1321+library, whereas only free software can use `libintl' as a static
1322+library or use modified versions of `libintl'.
1323+
1324+ Once the sources are changed appropriately and the setup can handle
1325+the use of `gettext' the only thing missing are the translations. The
1326+Free Translation Project is also available for packages which are not
1327+developed inside the GNU project. Therefore the information given above
1328+applies also for every other Free Software Project. Contact
1329+`coordinator@translationproject.org' to make the `.pot' files available
1330+to the translation teams.
1331+
1332
1333=== removed file 'AUTHORS'
1334--- AUTHORS 2008-06-09 11:56:12 +0000
1335+++ AUTHORS 1970-01-01 00:00:00 +0000
1336@@ -1,1 +0,0 @@
1337-Emmanuele Bassi <ebassi@openedhand.com>
1338
1339=== modified file 'ChangeLog'
1340--- ChangeLog 2011-05-18 15:01:29 +0000
1341+++ ChangeLog 2011-06-20 20:11:46 +0000
1342@@ -1,3 +1,530 @@
1343+commit 02b3ee77a35624a3d6e478ae3700100cb24bf18f
1344+Author: Emmanuele Bassi <ebassi@linux.intel.com>
1345+Date: Wed Jun 15 11:08:37 2011 +0100
1346+
1347+ Release JSON-GLib 0.13.4
1348+
1349+ NEWS | 6 ++++++
1350+ configure.ac | 2 +-
1351+ 2 files changed, 7 insertions(+), 1 deletions(-)
1352+
1353+commit f37878ec1759283f78a6d580c1f78e9039717862
1354+Author: Emmanuele Bassi <ebassi@linux.intel.com>
1355+Date: Wed Jun 15 11:08:12 2011 +0100
1356+
1357+ docs: Fix API reference missing symbols
1358+
1359+ doc/reference/json-glib-sections.txt | 4 ++++
1360+ json-glib/json-gobject.h | 6 ++++++
1361+ 2 files changed, 10 insertions(+), 0 deletions(-)
1362+
1363+commit c994a9bfdc13aba1b7c5fd019853c68fb38148a6
1364+Author: Emmanuele Bassi <ebassi@linux.intel.com>
1365+Date: Thu Jun 9 17:23:04 2011 +0100
1366+
1367+ Remove G_CONST_RETURN usage
1368+
1369+ See GLib bug:
1370+
1371+ https://bugzilla.gnome.org/show_bug.cgi?id=644611
1372+
1373+ The macro is going to be deprecated soon.
1374+
1375+ json-glib/json-array.c | 2 +-
1376+ json-glib/json-node.c | 6 +++---
1377+ json-glib/json-object.c | 2 +-
1378+ json-glib/json-reader.c | 6 +++---
1379+ json-glib/json-reader.h | 6 +++---
1380+ json-glib/json-types-private.h | 2 +-
1381+ json-glib/json-types.h | 8 ++++----
1382+ 7 files changed, 16 insertions(+), 16 deletions(-)
1383+
1384+commit 74bb5d61a737cceffd04c8d9ae8d5db390eda5a2
1385+Author: Emmanuele Bassi <ebassi@linux.intel.com>
1386+Date: Fri Jun 3 11:46:05 2011 +0100
1387+
1388+ Use the new atomic functions for refcounting
1389+
1390+ The newly added g_atomic_int_dec_and_test() simplified the logic for
1391+ unreffing Object and Array.
1392+
1393+ json-glib/json-array.c | 9 ++-------
1394+ json-glib/json-object.c | 9 ++-------
1395+ 2 files changed, 4 insertions(+), 14 deletions(-)
1396+
1397+commit 4f83868e3a18adac809aff111c5df5ff7af8fedf
1398+Author: Emmanuele Bassi <ebassi@linux.intel.com>
1399+Date: Fri Jun 3 11:18:27 2011 +0100
1400+
1401+ build: Remove deprecation disabling for GLib
1402+
1403+ json-glib/Makefile.am | 1 -
1404+ 1 files changed, 0 insertions(+), 1 deletions(-)
1405+
1406+commit 65a95198a4a1bca7b418af1639c4bb24b09947c5
1407+Author: Chun-wei Fan <fanchunwei@src.gnome.org>
1408+Date: Fri Jun 3 15:32:55 2011 +0800
1409+
1410+ Visual C++ support: projects for JSONPath test
1411+
1412+ Added projects to build test program for JSONPath (path-test.c)
1413+
1414+ build/win32/vs10/Makefile.am | 2 +
1415+ build/win32/vs10/install.vcxproj | 8 ++
1416+ build/win32/vs10/json-glib.sln | 26 +++--
1417+ build/win32/vs10/path-test.vcxproj | 159 ++++++++++++++++++++++++++++
1418+ build/win32/vs10/path-test.vcxproj.filters | 14 +++
1419+ build/win32/vs9/Makefile.am | 1 +
1420+ build/win32/vs9/json-glib.sln | 30 ++++--
1421+ build/win32/vs9/path-test.vcproj | 147 +++++++++++++++++++++++++
1422+ 8 files changed, 371 insertions(+), 16 deletions(-)
1423+
1424+commit 16bc9cccd32f4e1c7e9fc0da128aef969d0563b0
1425+Author: Chun-wei Fan <fanchunwei@src.gnome.org>
1426+Date: Fri Jun 3 15:01:16 2011 +0800
1427+
1428+ Update config.h.win32.in
1429+
1430+ Added definition of GETTEXT_PACKAGE due to the addition of the i18n
1431+ machinery (commit 67edce08670ce1da4956f87948985434ac5ae2ca)
1432+
1433+ build/win32/config.h.win32.in | 3 +++
1434+ 1 files changed, 3 insertions(+), 0 deletions(-)
1435+
1436+commit d93260c477930140f2ecf2927bd9f2a2d7f4f905
1437+Author: Chun-wei Fan <fanchunwei@src.gnome.org>
1438+Date: Fri Jun 3 14:47:42 2011 +0800
1439+
1440+ Update VS property sheets
1441+
1442+ -Add json-path.h to the list of headers to be copied in the "install" stage
1443+
1444+ build/win32/vs10/json-glib.props | 2 ++
1445+ build/win32/vs9/json-glib.vsprops | 1 +
1446+ 2 files changed, 3 insertions(+), 0 deletions(-)
1447+
1448+commit c3b367ca8bac245712f8390acab1b38a314972a9
1449+Author: Emmanuele Bassi <ebassi@linux.intel.com>
1450+Date: Wed Jun 1 17:10:17 2011 +0100
1451+
1452+ serializable: Fix introspection annotations
1453+
1454+ json-glib/json-serializable.c | 25 +++++++++++++++++++++++++
1455+ 1 files changed, 25 insertions(+), 0 deletions(-)
1456+
1457+commit aee5a7fbb70e5cb714bcfef79a96c000f62e80db
1458+Author: Emmanuele Bassi <ebassi@linux.intel.com>
1459+Date: Wed Jun 1 17:01:02 2011 +0100
1460+
1461+ Remove unused files
1462+
1463+ - AUTHORS
1464+ - MAINTAINER
1465+ replaced by json-glib.doap
1466+
1467+ - ChangeLog
1468+ empty, and not necessary with the foreign automake option
1469+
1470+ AUTHORS | 1 -
1471+ ChangeLog | 6 ------
1472+ MAINTAINERS | 3 ---
1473+ configure.ac | 5 +++--
1474+ 4 files changed, 3 insertions(+), 12 deletions(-)
1475+
1476+commit 1d4cdb76b6f97c723dd6e4c634bacc52d3199999
1477+Author: Emmanuele Bassi <ebassi@linux.intel.com>
1478+Date: Wed Jun 1 13:35:16 2011 +0100
1479+
1480+ Update the ignore file for the po directory
1481+
1482+ po/.gitignore | 1 +
1483+ 1 files changed, 1 insertions(+), 0 deletions(-)
1484+
1485+commit 8863766ca4792383dad0e48550f8fb79d4c104e4
1486+Author: Emmanuele Bassi <ebassi@linux.intel.com>
1487+Date: Wed Jun 1 13:21:32 2011 +0100
1488+
1489+ Mark GError messages for translations
1490+
1491+ These errors might find their way into a UI.
1492+
1493+ json-glib/json-gobject.c | 4 ++--
1494+ json-glib/json-gvariant.c | 40 ++++++++++++++++++----------------------
1495+ json-glib/json-parser.c | 5 ++++-
1496+ json-glib/json-path.c | 13 +++++++------
1497+ json-glib/json-reader.c | 20 ++++++++++----------
1498+ 5 files changed, 41 insertions(+), 41 deletions(-)
1499+
1500+commit 67edce08670ce1da4956f87948985434ac5ae2ca
1501+Author: Emmanuele Bassi <ebassi@linux.intel.com>
1502+Date: Wed Jun 1 13:09:01 2011 +0100
1503+
1504+ Add i18n machinery
1505+
1506+ We need to translate the GError messages.
1507+
1508+ .gitignore | 2 ++
1509+ Makefile.am | 2 +-
1510+ build/autotools/Makefile.am | 1 +
1511+ build/autotools/as-linguas.m4 | 24 ++++++++++++++++++++++++
1512+ configure.ac | 12 ++++++++++++
1513+ json-glib/json-gobject.c | 2 ++
1514+ json-glib/json-gvariant.c | 6 ++++++
1515+ json-glib/json-parser.c | 2 ++
1516+ json-glib/json-path.c | 4 +++-
1517+ json-glib/json-reader.c | 2 ++
1518+ po/.gitignore | 13 +++++++++++++
1519+ po/Makevars | 7 +++++++
1520+ po/POTFILES.in | 6 ++++++
1521+ 13 files changed, 81 insertions(+), 2 deletions(-)
1522+
1523+commit e3b5883d4435da7fe677eb9a7c74d2f83980f5da
1524+Author: Emmanuele Bassi <ebassi@linux.intel.com>
1525+Date: Wed Jun 1 12:49:28 2011 +0100
1526+
1527+ gobject: Do not serialize default values
1528+
1529+ If a property is set to its default value then we can skip its
1530+ serialization, to keep the number of JSON object members down.
1531+
1532+ json-glib/json-gobject.c | 7 +++++++
1533+ 1 files changed, 7 insertions(+), 0 deletions(-)
1534+
1535+commit 8c424cc133575282371bff8d17295662267049e9
1536+Author: Emmanuele Bassi <ebassi@linux.intel.com>
1537+Date: Wed Jun 1 12:48:20 2011 +0100
1538+
1539+ tests/serialize-complex: Modify the instance
1540+
1541+ Do not test the defaults: create the GObject instance with different
1542+ values than the default ones from the GParamSpec.
1543+
1544+ json-glib/tests/serialize-complex.c | 22 +++++++++++-----------
1545+ 1 files changed, 11 insertions(+), 11 deletions(-)
1546+
1547+commit 96b1e6b50f355c04e794ad7366bd33b9c3d1f81b
1548+Author: Emmanuele Bassi <ebassi@linux.intel.com>
1549+Date: Wed Jun 1 12:35:58 2011 +0100
1550+
1551+ serializable: Allow introspecting properties
1552+
1553+ This allows a Serializable implementation to override the property list,
1554+ and the setter and the getter function.
1555+
1556+ json-glib/json-gobject.c | 43 +++++++++++++++++-----
1557+ json-glib/json-gobject.h | 22 +++++++++++
1558+ json-glib/json-serializable.c | 81 +++++++++++++++++++++++++++++++++++++++++
1559+ 3 files changed, 137 insertions(+), 9 deletions(-)
1560+
1561+commit c85fc93f6235b8b9d584585215b2fa860f07f2c3
1562+Author: Emmanuele Bassi <ebassi@linux.intel.com>
1563+Date: Wed Jun 1 12:36:08 2011 +0100
1564+
1565+ Revert "path: Add some more validation points"
1566+
1567+ This reverts commit e8fa85705e48d03742eb351addbad53be4d8e60b.
1568+
1569+ The validation broke the test suite; it'll need some more work.
1570+
1571+ json-glib/json-path.c | 77 +++++++++++++-----------------------------------
1572+ 1 files changed, 21 insertions(+), 56 deletions(-)
1573+
1574+commit e8fa85705e48d03742eb351addbad53be4d8e60b
1575+Author: Emmanuele Bassi <ebassi@linux.intel.com>
1576+Date: Wed Jun 1 07:55:17 2011 +0100
1577+
1578+ path: Add some more validation points
1579+
1580+ Especially for the slice syntax.
1581+
1582+ json-glib/json-path.c | 77 +++++++++++++++++++++++++++++++++++-------------
1583+ 1 files changed, 56 insertions(+), 21 deletions(-)
1584+
1585+commit 295c469329d040b4d311e9c295bec908856190d6
1586+Author: Emmanuele Bassi <ebassi@linux.intel.com>
1587+Date: Wed Jun 1 07:54:48 2011 +0100
1588+
1589+ symbols: Add JsonPath public entry points
1590+
1591+ json-glib/json-glib.symbols | 6 ++++++
1592+ 1 files changed, 6 insertions(+), 0 deletions(-)
1593+
1594+commit 257209ab47ebcbf36006dd3aa3fcee5545381c6f
1595+Author: Emmanuele Bassi <ebassi@linux.intel.com>
1596+Date: Wed Jun 1 07:54:26 2011 +0100
1597+
1598+ docs: Document JsonPath and add it to the API reference
1599+
1600+ doc/reference/json-glib-docs.xml | 3 +-
1601+ doc/reference/json-glib-sections.txt | 20 ++++
1602+ doc/reference/json-glib.types | 1 +
1603+ json-glib/json-path.c | 174 +++++++++++++++++++++++++++++++++-
1604+ 4 files changed, 195 insertions(+), 3 deletions(-)
1605+
1606+commit ac89bb7fc7491019f8baa687a785eeb93af7213e
1607+Merge: b5bd477 4ea8cd4
1608+Author: Emmanuele Bassi <ebassi@linux.intel.com>
1609+Date: Tue May 31 23:16:10 2011 +0100
1610+
1611+ Merge branch 'wip/json-path'
1612+
1613+ * wip/json-path:
1614+ Add initial JSONPath implementation
1615+
1616+commit 4ea8cd43986d5888fb8e809a198d6b0331b12480
1617+Author: Emmanuele Bassi <ebassi@gnome.org>
1618+Date: Sat May 28 14:36:43 2011 +0100
1619+
1620+ Add initial JSONPath implementation
1621+
1622+ JSONPath is a JSON query syntax similar to what XPath does for XML;
1623+ using JSONPath it's possible to address a specific node (or set of
1624+ nodes) inside a JSON document.
1625+
1626+ The JsonPath class is a simple implementation of part of the JSONPath
1627+ proposal, as formalised by Stefan Gössner here:
1628+
1629+ http://goessner.net/articles/JsonPath/
1630+
1631+ The covered operators are:
1632+
1633+ • root, or '$';
1634+ • child, both using the dot-notation and the bracket notation;
1635+ • recursive descent, or '..';
1636+ • subscript, or '[]';
1637+ • set, or '[,]';
1638+ • slice, or '[start:end:step]'.
1639+
1640+ The only missing operators are the filter, or '?()' and the script,
1641+ or '()', because implementing a JavaScript interpreter inside JSON-GLib
1642+ is not one of my greatest aspirations. It should be possible, though,
1643+ to parse and evaluate simple arithmetic conditions, in the future.
1644+
1645+ The JsonPath methods are pretty straightforward: a JsonPath instance
1646+ should be created and used to compile an expression; the compilation
1647+ might result in a syntax error or not. Then, the JsonPath instance can
1648+ be used to match any JSON tree. Like the other JSONPath implementations,
1649+ JsonPath returns a JSON array of matching nodes.
1650+
1651+ A simple, one-off static method called json_path_query() is also
1652+ provided; the method wraps the JsonPath creation, the expression
1653+ compilation, and the matching, as well as disposing the JsonPath
1654+ instance once done.
1655+
1656+ For the time being, only positive testing is provided; negative testing
1657+ for the expression compilation will follow.
1658+
1659+ json-glib/Makefile.am | 2 +
1660+ json-glib/json-debug.c | 3 +-
1661+ json-glib/json-debug.h | 3 +-
1662+ json-glib/json-glib.h | 1 +
1663+ json-glib/json-path.c | 856 +++++++++++++++++++++++++++++++++++++++++++
1664+ json-glib/json-path.h | 97 +++++
1665+ json-glib/tests/Makefile.am | 1 +
1666+ json-glib/tests/path-test.c | 143 +++++++
1667+ 8 files changed, 1104 insertions(+), 2 deletions(-)
1668+
1669+commit b5bd47727c960990ba98902ee2d7099491a4178a
1670+Author: Chun-wei Fan <fanchunwei@src.gnome.org>
1671+Date: Mon May 30 14:26:54 2011 +0800
1672+
1673+ Add/update Visual C++ projects for GVariant API
1674+
1675+ -Added/dist VS 2008/2010 projects to compile the gvariant-test test program
1676+ (yes, the gvariant-test program passes in the 32-bit and 64-bit modes)
1677+ -Updated property sheet to "install" the "new" json-gvariant.h
1678+
1679+ build/win32/vs10/Makefile.am | 2 +
1680+ build/win32/vs10/gvariant-test.vcxproj | 159 ++++++++++++++++++++++++
1681+ build/win32/vs10/gvariant-test.vcxproj.filters | 14 ++
1682+ build/win32/vs10/json-glib.props | 2 +
1683+ build/win32/vs10/json-glib.sln | 10 ++
1684+ build/win32/vs9/Makefile.am | 1 +
1685+ build/win32/vs9/gvariant-test.vcproj | 147 ++++++++++++++++++++++
1686+ build/win32/vs9/json-glib.sln | 14 ++
1687+ build/win32/vs9/json-glib.vsprops | 1 +
1688+ 9 files changed, 350 insertions(+), 0 deletions(-)
1689+
1690+commit 3a1d817fd39b4b4d2bdbc93257be535c5b29780f
1691+Author: Chun-wei Fan <fanchunwei@src.gnome.org>
1692+Date: Mon May 30 13:07:53 2011 +0800
1693+
1694+ Update json-glib.symbols
1695+
1696+ Added the JSON-GLib gvariant-related APIs.
1697+
1698+ json-glib/json-glib.symbols | 4 ++++
1699+ 1 files changed, 4 insertions(+), 0 deletions(-)
1700+
1701+commit 1b7f20fe88a6647e61964db063eba071114a6f66
1702+Author: Chun-wei Fan <fanchunwei@src.gnome.org>
1703+Date: Mon May 30 12:53:47 2011 +0800
1704+
1705+ Update $(srcroot)/Makefile.am
1706+
1707+ Due to changes to this file in commit
1708+ 4e41d26586991d2977c846fa4871b6df39fe4106, change the order of SUBDIRS
1709+ so that "make dist" will properly run.
1710+
1711+ This has been checked with "make distcheck" on Fedora 15
1712+
1713+ Makefile.am | 2 +-
1714+ 1 files changed, 1 insertions(+), 1 deletions(-)
1715+
1716+commit 54172e25e8b62075f0aef98d21e17619466ff30f
1717+Author: Chun-wei Fan <fanchunwei@src.gnome.org>
1718+Date: Mon May 30 11:55:06 2011 +0800
1719+
1720+ Update Visual C++ Project Files
1721+
1722+ Update the dist part too...
1723+
1724+ build/win32/vs10/Makefile.am | 16 ++++++++--------
1725+ build/win32/vs9/Makefile.am | 8 ++++----
1726+ 2 files changed, 12 insertions(+), 12 deletions(-)
1727+
1728+commit 0715050a5a76f187f66f14288a8f3444a4eb49e4
1729+Author: Chun-wei Fan <fanchunwei@src.gnome.org>
1730+Date: Mon May 30 11:53:04 2011 +0800
1731+
1732+ Update VS 2008/2010 Project Files
1733+
1734+ Due to the changes in the location/names of some test programs in
1735+ commit 4e41d26586991d2977c846fa4871b6df39fe4106, update the VS
1736+ project files...
1737+
1738+ build/win32/vs10/boxed.vcxproj | 172 ++++++++++++++++++++
1739+ build/win32/vs10/boxed.vcxproj.filters | 14 ++
1740+ build/win32/vs10/install.vcxproj | 8 +-
1741+ build/win32/vs10/json-glib.sln | 8 +-
1742+ build/win32/vs10/serialize-complex.vcxproj | 171 +++++++++++++++++++
1743+ build/win32/vs10/serialize-complex.vcxproj.filters | 14 ++
1744+ build/win32/vs10/serialize-full.vcxproj | 172 ++++++++++++++++++++
1745+ build/win32/vs10/serialize-full.vcxproj.filters | 14 ++
1746+ build/win32/vs10/serialize-simple.vcxproj | 171 +++++++++++++++++++
1747+ build/win32/vs10/serialize-simple.vcxproj.filters | 14 ++
1748+ build/win32/vs10/test-serialize-boxed.vcxproj | 172 --------------------
1749+ .../vs10/test-serialize-boxed.vcxproj.filters | 14 --
1750+ build/win32/vs10/test-serialize-complex.vcxproj | 171 -------------------
1751+ .../vs10/test-serialize-complex.vcxproj.filters | 14 --
1752+ build/win32/vs10/test-serialize-full.vcxproj | 172 --------------------
1753+ .../win32/vs10/test-serialize-full.vcxproj.filters | 14 --
1754+ build/win32/vs10/test-serialize-simple.vcxproj | 171 -------------------
1755+ .../vs10/test-serialize-simple.vcxproj.filters | 14 --
1756+ build/win32/vs9/boxed.vcproj | 157 ++++++++++++++++++
1757+ build/win32/vs9/json-glib.sln | 8 +-
1758+ build/win32/vs9/serialize-complex.vcproj | 156 ++++++++++++++++++
1759+ build/win32/vs9/serialize-full.vcproj | 157 ++++++++++++++++++
1760+ build/win32/vs9/serialize-simple.vcproj | 156 ++++++++++++++++++
1761+ build/win32/vs9/test-serialize-boxed.vcproj | 157 ------------------
1762+ build/win32/vs9/test-serialize-complex.vcproj | 156 ------------------
1763+ build/win32/vs9/test-serialize-full.vcproj | 157 ------------------
1764+ build/win32/vs9/test-serialize-simple.vcproj | 156 ------------------
1765+ 27 files changed, 1380 insertions(+), 1380 deletions(-)
1766+
1767+commit 8b778252358ddb28936c6c9192a84f76368ca122
1768+Author: Emmanuele Bassi <ebassi@gnome.org>
1769+Date: Sat May 28 11:38:18 2011 +0100
1770+
1771+ tests: Fix up the JsonBuilder test
1772+
1773+ Clean up some odd code, and add a unit for the empty object case outlined
1774+ in bug 651271.
1775+
1776+ json-glib/tests/builder-test.c | 52 +++++++++++++++++++++++++++++++++++----
1777+ 1 files changed, 46 insertions(+), 6 deletions(-)
1778+
1779+commit d784cc6825607c517d7565049108d1f908a1d71b
1780+Author: Emmanuele Bassi <ebassi@gnome.org>
1781+Date: Sat May 28 11:36:55 2011 +0100
1782+
1783+ builder: Initialize state fields
1784+
1785+ If we're calling g_free() on a field we better make sure that it's either
1786+ NULL or contains valid data.
1787+
1788+ https://bugzilla.gnome.org/show_bug.cgi?id=651271
1789+
1790+ json-glib/json-builder.c | 1 +
1791+ 1 files changed, 1 insertions(+), 0 deletions(-)
1792+
1793+commit e20a8b0faeb45d1ae2f1bd12d49d31d12e357b24
1794+Author: Alexandre Mazari <scaroo@gmail.com>
1795+Date: Tue Mar 22 17:28:55 2011 +0100
1796+
1797+ gvariant: Fix introspection annotation
1798+
1799+ The 'signature' arguments of the json_gvariant_deserialize functions are
1800+ optional.
1801+
1802+ Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
1803+
1804+ json-glib/json-gvariant.c | 4 ++--
1805+ 1 files changed, 2 insertions(+), 2 deletions(-)
1806+
1807+commit 4e41d26586991d2977c846fa4871b6df39fe4106
1808+Author: Emmanuele Bassi <ebassi@gnome.org>
1809+Date: Sat May 28 11:05:57 2011 +0100
1810+
1811+ tests: Move all tests under json-glib
1812+
1813+ The test framework should live under the json-glib directory, and not be
1814+ spread across the project.
1815+
1816+ Makefile.am | 6 -
1817+ configure.ac | 2 -
1818+ json-glib/tests/Makefile.am | 53 ++---
1819+ json-glib/tests/boxed.c | 264 +++++++++++++++++++++++
1820+ json-glib/tests/serialize-complex.c | 293 +++++++++++++++++++++++++
1821+ json-glib/tests/serialize-full.c | 402 +++++++++++++++++++++++++++++++++++
1822+ json-glib/tests/serialize-simple.c | 166 ++++++++++++++
1823+ tests/Makefile.am | 34 ---
1824+ tests/test-serialize-boxed.c | 264 -----------------------
1825+ tests/test-serialize-complex.c | 293 -------------------------
1826+ tests/test-serialize-full.c | 402 -----------------------------------
1827+ tests/test-serialize-simple.c | 166 --------------
1828+ 12 files changed, 1142 insertions(+), 1203 deletions(-)
1829+
1830+commit 8d98b99b945423085232d358492e97399c9fd071
1831+Author: Chun-wei Fan <fanchunwei@src.gnome.org>
1832+Date: Mon May 23 09:39:20 2011 +0800
1833+
1834+ Update Visual Studio property sheets
1835+
1836+ -Make DLL/LIB versioning more like the autotools-compiled versions
1837+ -"Install" the headers in a more consistent way like the autotools versions
1838+
1839+ build/win32/vs10/json-glib.props | 26 +++++++++++++-------------
1840+ build/win32/vs9/json-glib.vsprops | 32 ++++++++++++++++----------------
1841+ 2 files changed, 29 insertions(+), 29 deletions(-)
1842+
1843+commit 15221448b5998a071b72299c666044dd65ea97e3
1844+Author: Emmanuele Bassi <ebassi@linux.intel.com>
1845+Date: Thu May 19 08:32:03 2011 +0100
1846+
1847+ Add ignore file under build/win32
1848+
1849+ build/win32/.gitignore | 4 ++++
1850+ 1 files changed, 4 insertions(+), 0 deletions(-)
1851+
1852+commit f4651885961bf3ccc8d475cdc86af051fe1101f6
1853+Author: Emmanuele Bassi <ebassi@linux.intel.com>
1854+Date: Wed May 18 13:44:07 2011 +0100
1855+
1856+ doap: Add the download-page resource
1857+
1858+ json-glib.doap | 2 ++
1859+ 1 files changed, 2 insertions(+), 0 deletions(-)
1860+
1861+commit 8ef7da62a7575ebb04c69b9d98fd24efb840ab3b
1862+Author: Emmanuele Bassi <ebassi@linux.intel.com>
1863+Date: Wed May 18 13:39:38 2011 +0100
1864+
1865+ Post-release version bump to 0.13.3
1866+
1867+ configure.ac | 2 +-
1868+ 1 files changed, 1 insertions(+), 1 deletions(-)
1869+
1870 commit aa793a4fbcc4d44d367ba84d3782823885fec045
1871 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1872 Date: Wed May 18 13:37:38 2011 +0100
1873
1874=== removed file 'INSTALL'
1875--- INSTALL 2010-05-28 11:49:23 +0000
1876+++ INSTALL 1970-01-01 00:00:00 +0000
1877@@ -1,365 +0,0 @@
1878-Installation Instructions
1879-*************************
1880-
1881-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
1882-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
1883-
1884- Copying and distribution of this file, with or without modification,
1885-are permitted in any medium without royalty provided the copyright
1886-notice and this notice are preserved. This file is offered as-is,
1887-without warranty of any kind.
1888-
1889-Basic Installation
1890-==================
1891-
1892- Briefly, the shell commands `./configure; make; make install' should
1893-configure, build, and install this package. The following
1894-more-detailed instructions are generic; see the `README' file for
1895-instructions specific to this package. Some packages provide this
1896-`INSTALL' file but do not implement all of the features documented
1897-below. The lack of an optional feature in a given package is not
1898-necessarily a bug. More recommendations for GNU packages can be found
1899-in *note Makefile Conventions: (standards)Makefile Conventions.
1900-
1901- The `configure' shell script attempts to guess correct values for
1902-various system-dependent variables used during compilation. It uses
1903-those values to create a `Makefile' in each directory of the package.
1904-It may also create one or more `.h' files containing system-dependent
1905-definitions. Finally, it creates a shell script `config.status' that
1906-you can run in the future to recreate the current configuration, and a
1907-file `config.log' containing compiler output (useful mainly for
1908-debugging `configure').
1909-
1910- It can also use an optional file (typically called `config.cache'
1911-and enabled with `--cache-file=config.cache' or simply `-C') that saves
1912-the results of its tests to speed up reconfiguring. Caching is
1913-disabled by default to prevent problems with accidental use of stale
1914-cache files.
1915-
1916- If you need to do unusual things to compile the package, please try
1917-to figure out how `configure' could check whether to do them, and mail
1918-diffs or instructions to the address given in the `README' so they can
1919-be considered for the next release. If you are using the cache, and at
1920-some point `config.cache' contains results you don't want to keep, you
1921-may remove or edit it.
1922-
1923- The file `configure.ac' (or `configure.in') is used to create
1924-`configure' by a program called `autoconf'. You need `configure.ac' if
1925-you want to change it or regenerate `configure' using a newer version
1926-of `autoconf'.
1927-
1928- The simplest way to compile this package is:
1929-
1930- 1. `cd' to the directory containing the package's source code and type
1931- `./configure' to configure the package for your system.
1932-
1933- Running `configure' might take a while. While running, it prints
1934- some messages telling which features it is checking for.
1935-
1936- 2. Type `make' to compile the package.
1937-
1938- 3. Optionally, type `make check' to run any self-tests that come with
1939- the package, generally using the just-built uninstalled binaries.
1940-
1941- 4. Type `make install' to install the programs and any data files and
1942- documentation. When installing into a prefix owned by root, it is
1943- recommended that the package be configured and built as a regular
1944- user, and only the `make install' phase executed with root
1945- privileges.
1946-
1947- 5. Optionally, type `make installcheck' to repeat any self-tests, but
1948- this time using the binaries in their final installed location.
1949- This target does not install anything. Running this target as a
1950- regular user, particularly if the prior `make install' required
1951- root privileges, verifies that the installation completed
1952- correctly.
1953-
1954- 6. You can remove the program binaries and object files from the
1955- source code directory by typing `make clean'. To also remove the
1956- files that `configure' created (so you can compile the package for
1957- a different kind of computer), type `make distclean'. There is
1958- also a `make maintainer-clean' target, but that is intended mainly
1959- for the package's developers. If you use it, you may have to get
1960- all sorts of other programs in order to regenerate files that came
1961- with the distribution.
1962-
1963- 7. Often, you can also type `make uninstall' to remove the installed
1964- files again. In practice, not all packages have tested that
1965- uninstallation works correctly, even though it is required by the
1966- GNU Coding Standards.
1967-
1968- 8. Some packages, particularly those that use Automake, provide `make
1969- distcheck', which can by used by developers to test that all other
1970- targets like `make install' and `make uninstall' work correctly.
1971- This target is generally not run by end users.
1972-
1973-Compilers and Options
1974-=====================
1975-
1976- Some systems require unusual options for compilation or linking that
1977-the `configure' script does not know about. Run `./configure --help'
1978-for details on some of the pertinent environment variables.
1979-
1980- You can give `configure' initial values for configuration parameters
1981-by setting variables in the command line or in the environment. Here
1982-is an example:
1983-
1984- ./configure CC=c99 CFLAGS=-g LIBS=-lposix
1985-
1986- *Note Defining Variables::, for more details.
1987-
1988-Compiling For Multiple Architectures
1989-====================================
1990-
1991- You can compile the package for more than one kind of computer at the
1992-same time, by placing the object files for each architecture in their
1993-own directory. To do this, you can use GNU `make'. `cd' to the
1994-directory where you want the object files and executables to go and run
1995-the `configure' script. `configure' automatically checks for the
1996-source code in the directory that `configure' is in and in `..'. This
1997-is known as a "VPATH" build.
1998-
1999- With a non-GNU `make', it is safer to compile the package for one
2000-architecture at a time in the source code directory. After you have
2001-installed the package for one architecture, use `make distclean' before
2002-reconfiguring for another architecture.
2003-
2004- On MacOS X 10.5 and later systems, you can create libraries and
2005-executables that work on multiple system types--known as "fat" or
2006-"universal" binaries--by specifying multiple `-arch' options to the
2007-compiler but only a single `-arch' option to the preprocessor. Like
2008-this:
2009-
2010- ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
2011- CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
2012- CPP="gcc -E" CXXCPP="g++ -E"
2013-
2014- This is not guaranteed to produce working output in all cases, you
2015-may have to build one architecture at a time and combine the results
2016-using the `lipo' tool if you have problems.
2017-
2018-Installation Names
2019-==================
2020-
2021- By default, `make install' installs the package's commands under
2022-`/usr/local/bin', include files under `/usr/local/include', etc. You
2023-can specify an installation prefix other than `/usr/local' by giving
2024-`configure' the option `--prefix=PREFIX', where PREFIX must be an
2025-absolute file name.
2026-
2027- You can specify separate installation prefixes for
2028-architecture-specific files and architecture-independent files. If you
2029-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
2030-PREFIX as the prefix for installing programs and libraries.
2031-Documentation and other data files still use the regular prefix.
2032-
2033- In addition, if you use an unusual directory layout you can give
2034-options like `--bindir=DIR' to specify different values for particular
2035-kinds of files. Run `configure --help' for a list of the directories
2036-you can set and what kinds of files go in them. In general, the
2037-default for these options is expressed in terms of `${prefix}', so that
2038-specifying just `--prefix' will affect all of the other directory
2039-specifications that were not explicitly provided.
2040-
2041- The most portable way to affect installation locations is to pass the
2042-correct locations to `configure'; however, many packages provide one or
2043-both of the following shortcuts of passing variable assignments to the
2044-`make install' command line to change installation locations without
2045-having to reconfigure or recompile.
2046-
2047- The first method involves providing an override variable for each
2048-affected directory. For example, `make install
2049-prefix=/alternate/directory' will choose an alternate location for all
2050-directory configuration variables that were expressed in terms of
2051-`${prefix}'. Any directories that were specified during `configure',
2052-but not in terms of `${prefix}', must each be overridden at install
2053-time for the entire installation to be relocated. The approach of
2054-makefile variable overrides for each directory variable is required by
2055-the GNU Coding Standards, and ideally causes no recompilation.
2056-However, some platforms have known limitations with the semantics of
2057-shared libraries that end up requiring recompilation when using this
2058-method, particularly noticeable in packages that use GNU Libtool.
2059-
2060- The second method involves providing the `DESTDIR' variable. For
2061-example, `make install DESTDIR=/alternate/directory' will prepend
2062-`/alternate/directory' before all installation names. The approach of
2063-`DESTDIR' overrides is not required by the GNU Coding Standards, and
2064-does not work on platforms that have drive letters. On the other hand,
2065-it does better at avoiding recompilation issues, and works well even
2066-when some directory options were not specified in terms of `${prefix}'
2067-at `configure' time.
2068-
2069-Optional Features
2070-=================
2071-
2072- If the package supports it, you can cause programs to be installed
2073-with an extra prefix or suffix on their names by giving `configure' the
2074-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
2075-
2076- Some packages pay attention to `--enable-FEATURE' options to
2077-`configure', where FEATURE indicates an optional part of the package.
2078-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
2079-is something like `gnu-as' or `x' (for the X Window System). The
2080-`README' should mention any `--enable-' and `--with-' options that the
2081-package recognizes.
2082-
2083- For packages that use the X Window System, `configure' can usually
2084-find the X include and library files automatically, but if it doesn't,
2085-you can use the `configure' options `--x-includes=DIR' and
2086-`--x-libraries=DIR' to specify their locations.
2087-
2088- Some packages offer the ability to configure how verbose the
2089-execution of `make' will be. For these packages, running `./configure
2090---enable-silent-rules' sets the default to minimal output, which can be
2091-overridden with `make V=1'; while running `./configure
2092---disable-silent-rules' sets the default to verbose, which can be
2093-overridden with `make V=0'.
2094-
2095-Particular systems
2096-==================
2097-
2098- On HP-UX, the default C compiler is not ANSI C compatible. If GNU
2099-CC is not installed, it is recommended to use the following options in
2100-order to use an ANSI C compiler:
2101-
2102- ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
2103-
2104-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
2105-
2106- On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
2107-parse its `<wchar.h>' header file. The option `-nodtk' can be used as
2108-a workaround. If GNU CC is not installed, it is therefore recommended
2109-to try
2110-
2111- ./configure CC="cc"
2112-
2113-and if that doesn't work, try
2114-
2115- ./configure CC="cc -nodtk"
2116-
2117- On Solaris, don't put `/usr/ucb' early in your `PATH'. This
2118-directory contains several dysfunctional programs; working variants of
2119-these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
2120-in your `PATH', put it _after_ `/usr/bin'.
2121-
2122- On Haiku, software installed for all users goes in `/boot/common',
2123-not `/usr/local'. It is recommended to use the following options:
2124-
2125- ./configure --prefix=/boot/common
2126-
2127-Specifying the System Type
2128-==========================
2129-
2130- There may be some features `configure' cannot figure out
2131-automatically, but needs to determine by the type of machine the package
2132-will run on. Usually, assuming the package is built to be run on the
2133-_same_ architectures, `configure' can figure that out, but if it prints
2134-a message saying it cannot guess the machine type, give it the
2135-`--build=TYPE' option. TYPE can either be a short name for the system
2136-type, such as `sun4', or a canonical name which has the form:
2137-
2138- CPU-COMPANY-SYSTEM
2139-
2140-where SYSTEM can have one of these forms:
2141-
2142- OS
2143- KERNEL-OS
2144-
2145- See the file `config.sub' for the possible values of each field. If
2146-`config.sub' isn't included in this package, then this package doesn't
2147-need to know the machine type.
2148-
2149- If you are _building_ compiler tools for cross-compiling, you should
2150-use the option `--target=TYPE' to select the type of system they will
2151-produce code for.
2152-
2153- If you want to _use_ a cross compiler, that generates code for a
2154-platform different from the build platform, you should specify the
2155-"host" platform (i.e., that on which the generated programs will
2156-eventually be run) with `--host=TYPE'.
2157-
2158-Sharing Defaults
2159-================
2160-
2161- If you want to set default values for `configure' scripts to share,
2162-you can create a site shell script called `config.site' that gives
2163-default values for variables like `CC', `cache_file', and `prefix'.
2164-`configure' looks for `PREFIX/share/config.site' if it exists, then
2165-`PREFIX/etc/config.site' if it exists. Or, you can set the
2166-`CONFIG_SITE' environment variable to the location of the site script.
2167-A warning: not all `configure' scripts look for a site script.
2168-
2169-Defining Variables
2170-==================
2171-
2172- Variables not defined in a site shell script can be set in the
2173-environment passed to `configure'. However, some packages may run
2174-configure again during the build, and the customized values of these
2175-variables may be lost. In order to avoid this problem, you should set
2176-them in the `configure' command line, using `VAR=value'. For example:
2177-
2178- ./configure CC=/usr/local2/bin/gcc
2179-
2180-causes the specified `gcc' to be used as the C compiler (unless it is
2181-overridden in the site shell script).
2182-
2183-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
2184-an Autoconf bug. Until the bug is fixed you can use this workaround:
2185-
2186- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
2187-
2188-`configure' Invocation
2189-======================
2190-
2191- `configure' recognizes the following options to control how it
2192-operates.
2193-
2194-`--help'
2195-`-h'
2196- Print a summary of all of the options to `configure', and exit.
2197-
2198-`--help=short'
2199-`--help=recursive'
2200- Print a summary of the options unique to this package's
2201- `configure', and exit. The `short' variant lists options used
2202- only in the top level, while the `recursive' variant lists options
2203- also present in any nested packages.
2204-
2205-`--version'
2206-`-V'
2207- Print the version of Autoconf used to generate the `configure'
2208- script, and exit.
2209-
2210-`--cache-file=FILE'
2211- Enable the cache: use and save the results of the tests in FILE,
2212- traditionally `config.cache'. FILE defaults to `/dev/null' to
2213- disable caching.
2214-
2215-`--config-cache'
2216-`-C'
2217- Alias for `--cache-file=config.cache'.
2218-
2219-`--quiet'
2220-`--silent'
2221-`-q'
2222- Do not print messages saying which checks are being made. To
2223- suppress all normal output, redirect it to `/dev/null' (any error
2224- messages will still be shown).
2225-
2226-`--srcdir=DIR'
2227- Look for the package's source code in directory DIR. Usually
2228- `configure' can determine that directory automatically.
2229-
2230-`--prefix=DIR'
2231- Use DIR as the installation prefix. *note Installation Names::
2232- for more details, including other options available for fine-tuning
2233- the installation locations.
2234-
2235-`--no-create'
2236-`-n'
2237- Run the configure checks, but stop before creating any output
2238- files.
2239-
2240-`configure' also accepts some other, not widely useful, options. Run
2241-`configure --help' for more details.
2242-
2243
2244=== modified file 'Makefile.am'
2245--- Makefile.am 2011-05-18 15:01:29 +0000
2246+++ Makefile.am 2011-06-20 20:11:46 +0000
2247@@ -3,13 +3,7 @@
2248
2249 ACLOCAL_AMFLAGS = -I build/autotools
2250
2251-SUBDIRS = build json-glib doc
2252-
2253-if ENABLE_GLIB_TEST
2254-SUBDIRS += tests
2255-endif
2256-
2257-DIST_SUBDIRS = json-glib doc tests build
2258+SUBDIRS = json-glib doc build po
2259
2260 pcfiles = json-glib-1.0.pc
2261
2262
2263=== modified file 'Makefile.in'
2264--- Makefile.in 2011-05-18 15:01:29 +0000
2265+++ Makefile.in 2011-06-20 20:11:46 +0000
2266@@ -43,21 +43,30 @@
2267 $(srcdir)/json-glib.pc.in \
2268 $(top_srcdir)/build/autotools/Makefile.am.gtest \
2269 $(top_srcdir)/build/autotools/Makefile.am.silent \
2270- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
2271- compile config.guess config.sub depcomp install-sh ltmain.sh \
2272- missing
2273-@ENABLE_GLIB_TEST_TRUE@am__append_1 = tests
2274+ $(top_srcdir)/configure ABOUT-NLS COPYING NEWS compile \
2275+ config.guess config.rpath config.sub depcomp install-sh \
2276+ ltmain.sh missing
2277 subdir = .
2278 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
2279 am__aclocal_m4_deps = \
2280 $(top_srcdir)/build/autotools/as-compiler-flag.m4 \
2281+ $(top_srcdir)/build/autotools/as-linguas.m4 \
2282+ $(top_srcdir)/build/autotools/gettext.m4 \
2283 $(top_srcdir)/build/autotools/gtk-doc.m4 \
2284+ $(top_srcdir)/build/autotools/iconv.m4 \
2285+ $(top_srcdir)/build/autotools/intlmacosx.m4 \
2286 $(top_srcdir)/build/autotools/introspection.m4 \
2287+ $(top_srcdir)/build/autotools/lib-ld.m4 \
2288+ $(top_srcdir)/build/autotools/lib-link.m4 \
2289+ $(top_srcdir)/build/autotools/lib-prefix.m4 \
2290 $(top_srcdir)/build/autotools/libtool.m4 \
2291 $(top_srcdir)/build/autotools/ltoptions.m4 \
2292 $(top_srcdir)/build/autotools/ltsugar.m4 \
2293 $(top_srcdir)/build/autotools/ltversion.m4 \
2294 $(top_srcdir)/build/autotools/lt~obsolete.m4 \
2295+ $(top_srcdir)/build/autotools/nls.m4 \
2296+ $(top_srcdir)/build/autotools/po.m4 \
2297+ $(top_srcdir)/build/autotools/progtest.m4 \
2298 $(top_srcdir)/configure.ac
2299 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
2300 $(ACLOCAL_M4)
2301@@ -112,6 +121,7 @@
2302 distdir dist dist-all distcheck
2303 ETAGS = etags
2304 CTAGS = ctags
2305+DIST_SUBDIRS = $(SUBDIRS)
2306 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
2307 distdir = $(PACKAGE)-$(VERSION)
2308 top_distdir = $(distdir)
2309@@ -149,6 +159,7 @@
2310 distuninstallcheck_listfiles = find . -type f -print
2311 distcleancheck_listfiles = find . -type f -print
2312 ACLOCAL = @ACLOCAL@
2313+ALL_LINGUAS = @ALL_LINGUAS@
2314 AMTAR = @AMTAR@
2315 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
2316 AR = @AR@
2317@@ -175,11 +186,15 @@
2318 FGREP = @FGREP@
2319 GCOV_CFLAGS = @GCOV_CFLAGS@
2320 GCOV_LDFLAGS = @GCOV_LDFLAGS@
2321+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
2322+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
2323 GLIB_CFLAGS = @GLIB_CFLAGS@
2324 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
2325 GLIB_LIBS = @GLIB_LIBS@
2326 GLIB_MKENUMS = @GLIB_MKENUMS@
2327 GLIB_PREFIX = @GLIB_PREFIX@
2328+GMSGFMT = @GMSGFMT@
2329+GMSGFMT_015 = @GMSGFMT_015@
2330 GOBJECT_QUERY = @GOBJECT_QUERY@
2331 GREP = @GREP@
2332 GTKDOC_CHECK = @GTKDOC_CHECK@
2333@@ -191,6 +206,8 @@
2334 INSTALL_PROGRAM = @INSTALL_PROGRAM@
2335 INSTALL_SCRIPT = @INSTALL_SCRIPT@
2336 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
2337+INTLLIBS = @INTLLIBS@
2338+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
2339 INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
2340 INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
2341 INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
2342@@ -210,16 +227,23 @@
2343 JSON_VERSION = @JSON_VERSION@
2344 LD = @LD@
2345 LDFLAGS = @LDFLAGS@
2346+LIBICONV = @LIBICONV@
2347+LIBINTL = @LIBINTL@
2348 LIBOBJS = @LIBOBJS@
2349 LIBS = @LIBS@
2350 LIBTOOL = @LIBTOOL@
2351 LIPO = @LIPO@
2352 LN_S = @LN_S@
2353+LTLIBICONV = @LTLIBICONV@
2354+LTLIBINTL = @LTLIBINTL@
2355 LTLIBOBJS = @LTLIBOBJS@
2356 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
2357 MAKEINFO = @MAKEINFO@
2358 MANIFEST_TOOL = @MANIFEST_TOOL@
2359 MKDIR_P = @MKDIR_P@
2360+MSGFMT = @MSGFMT@
2361+MSGFMT_015 = @MSGFMT_015@
2362+MSGMERGE = @MSGMERGE@
2363 NM = @NM@
2364 NMEDIT = @NMEDIT@
2365 OBJDUMP = @OBJDUMP@
2366@@ -237,12 +261,17 @@
2367 PKG_CONFIG = @PKG_CONFIG@
2368 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
2369 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
2370+POSUB = @POSUB@
2371 RANLIB = @RANLIB@
2372 SED = @SED@
2373 SET_MAKE = @SET_MAKE@
2374 SHELL = @SHELL@
2375 STRIP = @STRIP@
2376+USE_NLS = @USE_NLS@
2377 VERSION = @VERSION@
2378+XGETTEXT = @XGETTEXT@
2379+XGETTEXT_015 = @XGETTEXT_015@
2380+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
2381 abs_builddir = @abs_builddir@
2382 abs_srcdir = @abs_srcdir@
2383 abs_top_builddir = @abs_top_builddir@
2384@@ -309,8 +338,7 @@
2385 QUIET_RM_ = $(QUIET_RM_$(AM_DEFAULT_VERBOSITY))
2386 QUIET_RM_0 = @echo ' RM '$@;
2387 ACLOCAL_AMFLAGS = -I build/autotools
2388-SUBDIRS = build json-glib doc $(am__append_1)
2389-DIST_SUBDIRS = json-glib doc tests build
2390+SUBDIRS = json-glib doc build po
2391 pcfiles = json-glib-1.0.pc
2392 pkgconfig_DATA = $(pcfiles)
2393 pkgconfigdir = $(libdir)/pkgconfig
2394@@ -326,15 +354,15 @@
2395 @for dep in $?; do \
2396 case '$(am__configure_deps)' in \
2397 *$$dep*) \
2398- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
2399- $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
2400+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
2401+ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
2402 && exit 0; \
2403 exit 1;; \
2404 esac; \
2405 done; \
2406- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
2407+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
2408 $(am__cd) $(top_srcdir) && \
2409- $(AUTOMAKE) --gnu Makefile
2410+ $(AUTOMAKE) --foreign Makefile
2411 .PRECIOUS: Makefile
2412 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
2413 @case '$?' in \
2414
2415=== modified file 'NEWS'
2416--- NEWS 2011-05-18 15:01:29 +0000
2417+++ NEWS 2011-06-20 20:11:46 +0000
2418@@ -9,6 +9,12 @@
2419 • Add missing introspection annotations [Luca Bruno]
2420 • Add JsonReader.list_members()
2421 • Allow using JsonReader.read_element() on JSON objects
2422+• Remove all G_CONST_RETURN usage after the deprecation
2423+• Allow JsonSerializable to override the introspection and
2424+ modification of properties
2425+• Add i18n support for GError messages
2426+• Do not serialize GObject properties that match their default
2427+ values.
2428
2429 Overview of changes for 0.12.0
2430 ==============================
2431
2432=== modified file 'aclocal.m4'
2433--- aclocal.m4 2011-05-18 15:01:29 +0000
2434+++ aclocal.m4 2011-06-20 20:11:46 +0000
2435@@ -1382,10 +1382,20 @@
2436 ])
2437
2438 m4_include([build/autotools/as-compiler-flag.m4])
2439+m4_include([build/autotools/as-linguas.m4])
2440+m4_include([build/autotools/gettext.m4])
2441 m4_include([build/autotools/gtk-doc.m4])
2442+m4_include([build/autotools/iconv.m4])
2443+m4_include([build/autotools/intlmacosx.m4])
2444 m4_include([build/autotools/introspection.m4])
2445+m4_include([build/autotools/lib-ld.m4])
2446+m4_include([build/autotools/lib-link.m4])
2447+m4_include([build/autotools/lib-prefix.m4])
2448 m4_include([build/autotools/libtool.m4])
2449 m4_include([build/autotools/ltoptions.m4])
2450 m4_include([build/autotools/ltsugar.m4])
2451 m4_include([build/autotools/ltversion.m4])
2452 m4_include([build/autotools/lt~obsolete.m4])
2453+m4_include([build/autotools/nls.m4])
2454+m4_include([build/autotools/po.m4])
2455+m4_include([build/autotools/progtest.m4])
2456
2457=== modified file 'build/Makefile.in'
2458--- build/Makefile.in 2011-05-18 15:01:29 +0000
2459+++ build/Makefile.in 2011-06-20 20:11:46 +0000
2460@@ -38,13 +38,23 @@
2461 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
2462 am__aclocal_m4_deps = \
2463 $(top_srcdir)/build/autotools/as-compiler-flag.m4 \
2464+ $(top_srcdir)/build/autotools/as-linguas.m4 \
2465+ $(top_srcdir)/build/autotools/gettext.m4 \
2466 $(top_srcdir)/build/autotools/gtk-doc.m4 \
2467+ $(top_srcdir)/build/autotools/iconv.m4 \
2468+ $(top_srcdir)/build/autotools/intlmacosx.m4 \
2469 $(top_srcdir)/build/autotools/introspection.m4 \
2470+ $(top_srcdir)/build/autotools/lib-ld.m4 \
2471+ $(top_srcdir)/build/autotools/lib-link.m4 \
2472+ $(top_srcdir)/build/autotools/lib-prefix.m4 \
2473 $(top_srcdir)/build/autotools/libtool.m4 \
2474 $(top_srcdir)/build/autotools/ltoptions.m4 \
2475 $(top_srcdir)/build/autotools/ltsugar.m4 \
2476 $(top_srcdir)/build/autotools/ltversion.m4 \
2477 $(top_srcdir)/build/autotools/lt~obsolete.m4 \
2478+ $(top_srcdir)/build/autotools/nls.m4 \
2479+ $(top_srcdir)/build/autotools/po.m4 \
2480+ $(top_srcdir)/build/autotools/progtest.m4 \
2481 $(top_srcdir)/configure.ac
2482 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
2483 $(ACLOCAL_M4)
2484@@ -102,6 +112,7 @@
2485 done; \
2486 reldir="$$dir2"
2487 ACLOCAL = @ACLOCAL@
2488+ALL_LINGUAS = @ALL_LINGUAS@
2489 AMTAR = @AMTAR@
2490 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
2491 AR = @AR@
2492@@ -128,11 +139,15 @@
2493 FGREP = @FGREP@
2494 GCOV_CFLAGS = @GCOV_CFLAGS@
2495 GCOV_LDFLAGS = @GCOV_LDFLAGS@
2496+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
2497+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
2498 GLIB_CFLAGS = @GLIB_CFLAGS@
2499 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
2500 GLIB_LIBS = @GLIB_LIBS@
2501 GLIB_MKENUMS = @GLIB_MKENUMS@
2502 GLIB_PREFIX = @GLIB_PREFIX@
2503+GMSGFMT = @GMSGFMT@
2504+GMSGFMT_015 = @GMSGFMT_015@
2505 GOBJECT_QUERY = @GOBJECT_QUERY@
2506 GREP = @GREP@
2507 GTKDOC_CHECK = @GTKDOC_CHECK@
2508@@ -144,6 +159,8 @@
2509 INSTALL_PROGRAM = @INSTALL_PROGRAM@
2510 INSTALL_SCRIPT = @INSTALL_SCRIPT@
2511 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
2512+INTLLIBS = @INTLLIBS@
2513+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
2514 INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
2515 INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
2516 INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
2517@@ -163,16 +180,23 @@
2518 JSON_VERSION = @JSON_VERSION@
2519 LD = @LD@
2520 LDFLAGS = @LDFLAGS@
2521+LIBICONV = @LIBICONV@
2522+LIBINTL = @LIBINTL@
2523 LIBOBJS = @LIBOBJS@
2524 LIBS = @LIBS@
2525 LIBTOOL = @LIBTOOL@
2526 LIPO = @LIPO@
2527 LN_S = @LN_S@
2528+LTLIBICONV = @LTLIBICONV@
2529+LTLIBINTL = @LTLIBINTL@
2530 LTLIBOBJS = @LTLIBOBJS@
2531 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
2532 MAKEINFO = @MAKEINFO@
2533 MANIFEST_TOOL = @MANIFEST_TOOL@
2534 MKDIR_P = @MKDIR_P@
2535+MSGFMT = @MSGFMT@
2536+MSGFMT_015 = @MSGFMT_015@
2537+MSGMERGE = @MSGMERGE@
2538 NM = @NM@
2539 NMEDIT = @NMEDIT@
2540 OBJDUMP = @OBJDUMP@
2541@@ -190,12 +214,17 @@
2542 PKG_CONFIG = @PKG_CONFIG@
2543 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
2544 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
2545+POSUB = @POSUB@
2546 RANLIB = @RANLIB@
2547 SED = @SED@
2548 SET_MAKE = @SET_MAKE@
2549 SHELL = @SHELL@
2550 STRIP = @STRIP@
2551+USE_NLS = @USE_NLS@
2552 VERSION = @VERSION@
2553+XGETTEXT = @XGETTEXT@
2554+XGETTEXT_015 = @XGETTEXT_015@
2555+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
2556 abs_builddir = @abs_builddir@
2557 abs_srcdir = @abs_srcdir@
2558 abs_top_builddir = @abs_top_builddir@
2559@@ -261,9 +290,9 @@
2560 exit 1;; \
2561 esac; \
2562 done; \
2563- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu build/Makefile'; \
2564+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/Makefile'; \
2565 $(am__cd) $(top_srcdir) && \
2566- $(AUTOMAKE) --gnu build/Makefile
2567+ $(AUTOMAKE) --foreign build/Makefile
2568 .PRECIOUS: Makefile
2569 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
2570 @case '$?' in \
2571
2572=== modified file 'build/autotools/Makefile.am'
2573--- build/autotools/Makefile.am 2011-05-18 15:01:29 +0000
2574+++ build/autotools/Makefile.am 2011-06-20 20:11:46 +0000
2575@@ -1,5 +1,6 @@
2576 EXTRA_DIST = \
2577 as-compiler-flag.m4 \
2578+ as-linguas.m4 \
2579 introspection.m4 \
2580 Makefile.am.silent \
2581 Makefile.am.enums \
2582
2583=== modified file 'build/autotools/Makefile.in'
2584--- build/autotools/Makefile.in 2011-05-18 15:01:29 +0000
2585+++ build/autotools/Makefile.in 2011-06-20 20:11:46 +0000
2586@@ -38,13 +38,23 @@
2587 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
2588 am__aclocal_m4_deps = \
2589 $(top_srcdir)/build/autotools/as-compiler-flag.m4 \
2590+ $(top_srcdir)/build/autotools/as-linguas.m4 \
2591+ $(top_srcdir)/build/autotools/gettext.m4 \
2592 $(top_srcdir)/build/autotools/gtk-doc.m4 \
2593+ $(top_srcdir)/build/autotools/iconv.m4 \
2594+ $(top_srcdir)/build/autotools/intlmacosx.m4 \
2595 $(top_srcdir)/build/autotools/introspection.m4 \
2596+ $(top_srcdir)/build/autotools/lib-ld.m4 \
2597+ $(top_srcdir)/build/autotools/lib-link.m4 \
2598+ $(top_srcdir)/build/autotools/lib-prefix.m4 \
2599 $(top_srcdir)/build/autotools/libtool.m4 \
2600 $(top_srcdir)/build/autotools/ltoptions.m4 \
2601 $(top_srcdir)/build/autotools/ltsugar.m4 \
2602 $(top_srcdir)/build/autotools/ltversion.m4 \
2603 $(top_srcdir)/build/autotools/lt~obsolete.m4 \
2604+ $(top_srcdir)/build/autotools/nls.m4 \
2605+ $(top_srcdir)/build/autotools/po.m4 \
2606+ $(top_srcdir)/build/autotools/progtest.m4 \
2607 $(top_srcdir)/configure.ac
2608 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
2609 $(ACLOCAL_M4)
2610@@ -62,6 +72,7 @@
2611 DIST_SOURCES =
2612 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
2613 ACLOCAL = @ACLOCAL@
2614+ALL_LINGUAS = @ALL_LINGUAS@
2615 AMTAR = @AMTAR@
2616 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
2617 AR = @AR@
2618@@ -88,11 +99,15 @@
2619 FGREP = @FGREP@
2620 GCOV_CFLAGS = @GCOV_CFLAGS@
2621 GCOV_LDFLAGS = @GCOV_LDFLAGS@
2622+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
2623+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
2624 GLIB_CFLAGS = @GLIB_CFLAGS@
2625 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
2626 GLIB_LIBS = @GLIB_LIBS@
2627 GLIB_MKENUMS = @GLIB_MKENUMS@
2628 GLIB_PREFIX = @GLIB_PREFIX@
2629+GMSGFMT = @GMSGFMT@
2630+GMSGFMT_015 = @GMSGFMT_015@
2631 GOBJECT_QUERY = @GOBJECT_QUERY@
2632 GREP = @GREP@
2633 GTKDOC_CHECK = @GTKDOC_CHECK@
2634@@ -104,6 +119,8 @@
2635 INSTALL_PROGRAM = @INSTALL_PROGRAM@
2636 INSTALL_SCRIPT = @INSTALL_SCRIPT@
2637 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
2638+INTLLIBS = @INTLLIBS@
2639+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
2640 INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
2641 INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
2642 INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
2643@@ -123,16 +140,23 @@
2644 JSON_VERSION = @JSON_VERSION@
2645 LD = @LD@
2646 LDFLAGS = @LDFLAGS@
2647+LIBICONV = @LIBICONV@
2648+LIBINTL = @LIBINTL@
2649 LIBOBJS = @LIBOBJS@
2650 LIBS = @LIBS@
2651 LIBTOOL = @LIBTOOL@
2652 LIPO = @LIPO@
2653 LN_S = @LN_S@
2654+LTLIBICONV = @LTLIBICONV@
2655+LTLIBINTL = @LTLIBINTL@
2656 LTLIBOBJS = @LTLIBOBJS@
2657 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
2658 MAKEINFO = @MAKEINFO@
2659 MANIFEST_TOOL = @MANIFEST_TOOL@
2660 MKDIR_P = @MKDIR_P@
2661+MSGFMT = @MSGFMT@
2662+MSGFMT_015 = @MSGFMT_015@
2663+MSGMERGE = @MSGMERGE@
2664 NM = @NM@
2665 NMEDIT = @NMEDIT@
2666 OBJDUMP = @OBJDUMP@
2667@@ -150,12 +174,17 @@
2668 PKG_CONFIG = @PKG_CONFIG@
2669 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
2670 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
2671+POSUB = @POSUB@
2672 RANLIB = @RANLIB@
2673 SED = @SED@
2674 SET_MAKE = @SET_MAKE@
2675 SHELL = @SHELL@
2676 STRIP = @STRIP@
2677+USE_NLS = @USE_NLS@
2678 VERSION = @VERSION@
2679+XGETTEXT = @XGETTEXT@
2680+XGETTEXT_015 = @XGETTEXT_015@
2681+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
2682 abs_builddir = @abs_builddir@
2683 abs_srcdir = @abs_srcdir@
2684 abs_top_builddir = @abs_top_builddir@
2685@@ -210,6 +239,7 @@
2686 top_srcdir = @top_srcdir@
2687 EXTRA_DIST = \
2688 as-compiler-flag.m4 \
2689+ as-linguas.m4 \
2690 introspection.m4 \
2691 Makefile.am.silent \
2692 Makefile.am.enums \
2693@@ -230,9 +260,9 @@
2694 exit 1;; \
2695 esac; \
2696 done; \
2697- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu build/autotools/Makefile'; \
2698+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/autotools/Makefile'; \
2699 $(am__cd) $(top_srcdir) && \
2700- $(AUTOMAKE) --gnu build/autotools/Makefile
2701+ $(AUTOMAKE) --foreign build/autotools/Makefile
2702 .PRECIOUS: Makefile
2703 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
2704 @case '$?' in \
2705
2706=== added file 'build/autotools/as-linguas.m4'
2707--- build/autotools/as-linguas.m4 1970-01-01 00:00:00 +0000
2708+++ build/autotools/as-linguas.m4 2011-06-20 20:11:46 +0000
2709@@ -0,0 +1,24 @@
2710+# Set ALL_ALL_LINGUAS based on the .po files present. Optional argument is the
2711+# name of the po directory. $podir/LINGUAS.ignore can be used to ignore a
2712+# subset of the po files.
2713+
2714+AC_DEFUN([AS_ALL_LINGUAS],
2715+[
2716+ AC_MSG_CHECKING([for linguas])
2717+ podir="m4_default([$1],[$srcdir/po])"
2718+ linguas=`cd $podir && ls *.po 2>/dev/null | awk 'BEGIN { FS="."; ORS=" " } { print $[]1 }'`
2719+ if test -f "$podir/LINGUAS.ignore"; then
2720+ ALL_LINGUAS="";
2721+ ignore_linguas=`sed -n -e 's/^\s\+\|\s\+$//g' -e '/^#/b' -e '/\S/!b' \
2722+ -e 's/\s\+/\n/g' -e p "$podir/LINGUAS.ignore"`;
2723+ for lang in $linguas; do
2724+ if ! echo "$ignore_linguas" | grep -q "^${lang}$"; then
2725+ ALL_LINGUAS="$ALL_LINGUAS $lang";
2726+ fi;
2727+ done;
2728+ else
2729+ ALL_LINGUAS="$linguas";
2730+ fi;
2731+ AC_SUBST([ALL_LINGUAS])
2732+ AC_MSG_RESULT($ALL_LINGUAS)
2733+])
2734
2735=== added file 'build/autotools/gettext.m4'
2736--- build/autotools/gettext.m4 1970-01-01 00:00:00 +0000
2737+++ build/autotools/gettext.m4 2011-06-20 20:11:46 +0000
2738@@ -0,0 +1,383 @@
2739+# gettext.m4 serial 63 (gettext-0.18)
2740+dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
2741+dnl This file is free software; the Free Software Foundation
2742+dnl gives unlimited permission to copy and/or distribute it,
2743+dnl with or without modifications, as long as this notice is preserved.
2744+dnl
2745+dnl This file can can be used in projects which are not available under
2746+dnl the GNU General Public License or the GNU Library General Public
2747+dnl License but which still want to provide support for the GNU gettext
2748+dnl functionality.
2749+dnl Please note that the actual code of the GNU gettext library is covered
2750+dnl by the GNU Library General Public License, and the rest of the GNU
2751+dnl gettext package package is covered by the GNU General Public License.
2752+dnl They are *not* in the public domain.
2753+
2754+dnl Authors:
2755+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
2756+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
2757+
2758+dnl Macro to add for using GNU gettext.
2759+
2760+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
2761+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
2762+dnl default (if it is not specified or empty) is 'no-libtool'.
2763+dnl INTLSYMBOL should be 'external' for packages with no intl directory,
2764+dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
2765+dnl If INTLSYMBOL is 'use-libtool', then a libtool library
2766+dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
2767+dnl depending on --{enable,disable}-{shared,static} and on the presence of
2768+dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
2769+dnl $(top_builddir)/intl/libintl.a will be created.
2770+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
2771+dnl implementations (in libc or libintl) without the ngettext() function
2772+dnl will be ignored. If NEEDSYMBOL is specified and is
2773+dnl 'need-formatstring-macros', then GNU gettext implementations that don't
2774+dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
2775+dnl INTLDIR is used to find the intl libraries. If empty,
2776+dnl the value `$(top_builddir)/intl/' is used.
2777+dnl
2778+dnl The result of the configuration is one of three cases:
2779+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
2780+dnl and used.
2781+dnl Catalog format: GNU --> install in $(datadir)
2782+dnl Catalog extension: .mo after installation, .gmo in source tree
2783+dnl 2) GNU gettext has been found in the system's C library.
2784+dnl Catalog format: GNU --> install in $(datadir)
2785+dnl Catalog extension: .mo after installation, .gmo in source tree
2786+dnl 3) No internationalization, always use English msgid.
2787+dnl Catalog format: none
2788+dnl Catalog extension: none
2789+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
2790+dnl The use of .gmo is historical (it was needed to avoid overwriting the
2791+dnl GNU format catalogs when building on a platform with an X/Open gettext),
2792+dnl but we keep it in order not to force irrelevant filename changes on the
2793+dnl maintainers.
2794+dnl
2795+AC_DEFUN([AM_GNU_GETTEXT],
2796+[
2797+ dnl Argument checking.
2798+ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
2799+ [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
2800+])])])])])
2801+ ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
2802+ [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
2803+ ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
2804+ [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
2805+])])])])
2806+ define([gt_included_intl],
2807+ ifelse([$1], [external],
2808+ ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
2809+ [yes]))
2810+ define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
2811+ gt_NEEDS_INIT
2812+ AM_GNU_GETTEXT_NEED([$2])
2813+
2814+ AC_REQUIRE([AM_PO_SUBDIRS])dnl
2815+ ifelse(gt_included_intl, yes, [
2816+ AC_REQUIRE([AM_INTL_SUBDIR])dnl
2817+ ])
2818+
2819+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
2820+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
2821+ AC_REQUIRE([AC_LIB_RPATH])
2822+
2823+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
2824+ dnl Ideally we would do this search only after the
2825+ dnl if test "$USE_NLS" = "yes"; then
2826+ dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
2827+ dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
2828+ dnl the configure script would need to contain the same shell code
2829+ dnl again, outside any 'if'. There are two solutions:
2830+ dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
2831+ dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
2832+ dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
2833+ dnl documented, we avoid it.
2834+ ifelse(gt_included_intl, yes, , [
2835+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
2836+ ])
2837+
2838+ dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
2839+ gt_INTL_MACOSX
2840+
2841+ dnl Set USE_NLS.
2842+ AC_REQUIRE([AM_NLS])
2843+
2844+ ifelse(gt_included_intl, yes, [
2845+ BUILD_INCLUDED_LIBINTL=no
2846+ USE_INCLUDED_LIBINTL=no
2847+ ])
2848+ LIBINTL=
2849+ LTLIBINTL=
2850+ POSUB=
2851+
2852+ dnl Add a version number to the cache macros.
2853+ case " $gt_needs " in
2854+ *" need-formatstring-macros "*) gt_api_version=3 ;;
2855+ *" need-ngettext "*) gt_api_version=2 ;;
2856+ *) gt_api_version=1 ;;
2857+ esac
2858+ gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
2859+ gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
2860+
2861+ dnl If we use NLS figure out what method
2862+ if test "$USE_NLS" = "yes"; then
2863+ gt_use_preinstalled_gnugettext=no
2864+ ifelse(gt_included_intl, yes, [
2865+ AC_MSG_CHECKING([whether included gettext is requested])
2866+ AC_ARG_WITH([included-gettext],
2867+ [ --with-included-gettext use the GNU gettext library included here],
2868+ nls_cv_force_use_gnu_gettext=$withval,
2869+ nls_cv_force_use_gnu_gettext=no)
2870+ AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
2871+
2872+ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
2873+ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
2874+ ])
2875+ dnl User does not insist on using GNU NLS library. Figure out what
2876+ dnl to use. If GNU gettext is available we use this. Else we have
2877+ dnl to fall back to GNU NLS library.
2878+
2879+ if test $gt_api_version -ge 3; then
2880+ gt_revision_test_code='
2881+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
2882+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
2883+#endif
2884+changequote(,)dnl
2885+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
2886+changequote([,])dnl
2887+'
2888+ else
2889+ gt_revision_test_code=
2890+ fi
2891+ if test $gt_api_version -ge 2; then
2892+ gt_expression_test_code=' + * ngettext ("", "", 0)'
2893+ else
2894+ gt_expression_test_code=
2895+ fi
2896+
2897+ AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
2898+ [AC_TRY_LINK([#include <libintl.h>
2899+$gt_revision_test_code
2900+extern int _nl_msg_cat_cntr;
2901+extern int *_nl_domain_bindings;],
2902+ [bindtextdomain ("", "");
2903+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
2904+ [eval "$gt_func_gnugettext_libc=yes"],
2905+ [eval "$gt_func_gnugettext_libc=no"])])
2906+
2907+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
2908+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
2909+ ifelse(gt_included_intl, yes, , [
2910+ AM_ICONV_LINK
2911+ ])
2912+ dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
2913+ dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
2914+ dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
2915+ dnl even if libiconv doesn't exist.
2916+ AC_LIB_LINKFLAGS_BODY([intl])
2917+ AC_CACHE_CHECK([for GNU gettext in libintl],
2918+ [$gt_func_gnugettext_libintl],
2919+ [gt_save_CPPFLAGS="$CPPFLAGS"
2920+ CPPFLAGS="$CPPFLAGS $INCINTL"
2921+ gt_save_LIBS="$LIBS"
2922+ LIBS="$LIBS $LIBINTL"
2923+ dnl Now see whether libintl exists and does not depend on libiconv.
2924+ AC_TRY_LINK([#include <libintl.h>
2925+$gt_revision_test_code
2926+extern int _nl_msg_cat_cntr;
2927+extern
2928+#ifdef __cplusplus
2929+"C"
2930+#endif
2931+const char *_nl_expand_alias (const char *);],
2932+ [bindtextdomain ("", "");
2933+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
2934+ [eval "$gt_func_gnugettext_libintl=yes"],
2935+ [eval "$gt_func_gnugettext_libintl=no"])
2936+ dnl Now see whether libintl exists and depends on libiconv.
2937+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
2938+ LIBS="$LIBS $LIBICONV"
2939+ AC_TRY_LINK([#include <libintl.h>
2940+$gt_revision_test_code
2941+extern int _nl_msg_cat_cntr;
2942+extern
2943+#ifdef __cplusplus
2944+"C"
2945+#endif
2946+const char *_nl_expand_alias (const char *);],
2947+ [bindtextdomain ("", "");
2948+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
2949+ [LIBINTL="$LIBINTL $LIBICONV"
2950+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
2951+ eval "$gt_func_gnugettext_libintl=yes"
2952+ ])
2953+ fi
2954+ CPPFLAGS="$gt_save_CPPFLAGS"
2955+ LIBS="$gt_save_LIBS"])
2956+ fi
2957+
2958+ dnl If an already present or preinstalled GNU gettext() is found,
2959+ dnl use it. But if this macro is used in GNU gettext, and GNU
2960+ dnl gettext is already preinstalled in libintl, we update this
2961+ dnl libintl. (Cf. the install rule in intl/Makefile.in.)
2962+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
2963+ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
2964+ && test "$PACKAGE" != gettext-runtime \
2965+ && test "$PACKAGE" != gettext-tools; }; then
2966+ gt_use_preinstalled_gnugettext=yes
2967+ else
2968+ dnl Reset the values set by searching for libintl.
2969+ LIBINTL=
2970+ LTLIBINTL=
2971+ INCINTL=
2972+ fi
2973+
2974+ ifelse(gt_included_intl, yes, [
2975+ if test "$gt_use_preinstalled_gnugettext" != "yes"; then
2976+ dnl GNU gettext is not found in the C library.
2977+ dnl Fall back on included GNU gettext library.
2978+ nls_cv_use_gnu_gettext=yes
2979+ fi
2980+ fi
2981+
2982+ if test "$nls_cv_use_gnu_gettext" = "yes"; then
2983+ dnl Mark actions used to generate GNU NLS library.
2984+ BUILD_INCLUDED_LIBINTL=yes
2985+ USE_INCLUDED_LIBINTL=yes
2986+ LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
2987+ LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
2988+ LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
2989+ fi
2990+
2991+ CATOBJEXT=
2992+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
2993+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
2994+ dnl Mark actions to use GNU gettext tools.
2995+ CATOBJEXT=.gmo
2996+ fi
2997+ ])
2998+
2999+ if test -n "$INTL_MACOSX_LIBS"; then
3000+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
3001+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
3002+ dnl Some extra flags are needed during linking.
3003+ LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
3004+ LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
3005+ fi
3006+ fi
3007+
3008+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
3009+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
3010+ AC_DEFINE([ENABLE_NLS], [1],
3011+ [Define to 1 if translation of program messages to the user's native language
3012+ is requested.])
3013+ else
3014+ USE_NLS=no
3015+ fi
3016+ fi
3017+
3018+ AC_MSG_CHECKING([whether to use NLS])
3019+ AC_MSG_RESULT([$USE_NLS])
3020+ if test "$USE_NLS" = "yes"; then
3021+ AC_MSG_CHECKING([where the gettext function comes from])
3022+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
3023+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
3024+ gt_source="external libintl"
3025+ else
3026+ gt_source="libc"
3027+ fi
3028+ else
3029+ gt_source="included intl directory"
3030+ fi
3031+ AC_MSG_RESULT([$gt_source])
3032+ fi
3033+
3034+ if test "$USE_NLS" = "yes"; then
3035+
3036+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
3037+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
3038+ AC_MSG_CHECKING([how to link with libintl])
3039+ AC_MSG_RESULT([$LIBINTL])
3040+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
3041+ fi
3042+
3043+ dnl For backward compatibility. Some packages may be using this.
3044+ AC_DEFINE([HAVE_GETTEXT], [1],
3045+ [Define if the GNU gettext() function is already present or preinstalled.])
3046+ AC_DEFINE([HAVE_DCGETTEXT], [1],
3047+ [Define if the GNU dcgettext() function is already present or preinstalled.])
3048+ fi
3049+
3050+ dnl We need to process the po/ directory.
3051+ POSUB=po
3052+ fi
3053+
3054+ ifelse(gt_included_intl, yes, [
3055+ dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
3056+ dnl to 'yes' because some of the testsuite requires it.
3057+ if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
3058+ BUILD_INCLUDED_LIBINTL=yes
3059+ fi
3060+
3061+ dnl Make all variables we use known to autoconf.
3062+ AC_SUBST([BUILD_INCLUDED_LIBINTL])
3063+ AC_SUBST([USE_INCLUDED_LIBINTL])
3064+ AC_SUBST([CATOBJEXT])
3065+
3066+ dnl For backward compatibility. Some configure.ins may be using this.
3067+ nls_cv_header_intl=
3068+ nls_cv_header_libgt=
3069+
3070+ dnl For backward compatibility. Some Makefiles may be using this.
3071+ DATADIRNAME=share
3072+ AC_SUBST([DATADIRNAME])
3073+
3074+ dnl For backward compatibility. Some Makefiles may be using this.
3075+ INSTOBJEXT=.mo
3076+ AC_SUBST([INSTOBJEXT])
3077+
3078+ dnl For backward compatibility. Some Makefiles may be using this.
3079+ GENCAT=gencat
3080+ AC_SUBST([GENCAT])
3081+
3082+ dnl For backward compatibility. Some Makefiles may be using this.
3083+ INTLOBJS=
3084+ if test "$USE_INCLUDED_LIBINTL" = yes; then
3085+ INTLOBJS="\$(GETTOBJS)"
3086+ fi
3087+ AC_SUBST([INTLOBJS])
3088+
3089+ dnl Enable libtool support if the surrounding package wishes it.
3090+ INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
3091+ AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
3092+ ])
3093+
3094+ dnl For backward compatibility. Some Makefiles may be using this.
3095+ INTLLIBS="$LIBINTL"
3096+ AC_SUBST([INTLLIBS])
3097+
3098+ dnl Make all documented variables known to autoconf.
3099+ AC_SUBST([LIBINTL])
3100+ AC_SUBST([LTLIBINTL])
3101+ AC_SUBST([POSUB])
3102+])
3103+
3104+
3105+dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
3106+m4_define([gt_NEEDS_INIT],
3107+[
3108+ m4_divert_text([DEFAULTS], [gt_needs=])
3109+ m4_define([gt_NEEDS_INIT], [])
3110+])
3111+
3112+
3113+dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
3114+AC_DEFUN([AM_GNU_GETTEXT_NEED],
3115+[
3116+ m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
3117+])
3118+
3119+
3120+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
3121+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
3122
3123=== added file 'build/autotools/iconv.m4'
3124--- build/autotools/iconv.m4 1970-01-01 00:00:00 +0000
3125+++ build/autotools/iconv.m4 2011-06-20 20:11:46 +0000
3126@@ -0,0 +1,199 @@
3127+# iconv.m4 serial 9 (gettext-0.18)
3128+dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
3129+dnl This file is free software; the Free Software Foundation
3130+dnl gives unlimited permission to copy and/or distribute it,
3131+dnl with or without modifications, as long as this notice is preserved.
3132+
3133+dnl From Bruno Haible.
3134+
3135+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
3136+[
3137+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
3138+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
3139+ AC_REQUIRE([AC_LIB_RPATH])
3140+
3141+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
3142+ dnl accordingly.
3143+ AC_LIB_LINKFLAGS_BODY([iconv])
3144+])
3145+
3146+AC_DEFUN([AM_ICONV_LINK],
3147+[
3148+ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
3149+ dnl those with the standalone portable GNU libiconv installed).
3150+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
3151+
3152+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
3153+ dnl accordingly.
3154+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
3155+
3156+ dnl Add $INCICONV to CPPFLAGS before performing the following checks,
3157+ dnl because if the user has installed libiconv and not disabled its use
3158+ dnl via --without-libiconv-prefix, he wants to use it. The first
3159+ dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
3160+ am_save_CPPFLAGS="$CPPFLAGS"
3161+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
3162+
3163+ AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
3164+ am_cv_func_iconv="no, consider installing GNU libiconv"
3165+ am_cv_lib_iconv=no
3166+ AC_TRY_LINK([#include <stdlib.h>
3167+#include <iconv.h>],
3168+ [iconv_t cd = iconv_open("","");
3169+ iconv(cd,NULL,NULL,NULL,NULL);
3170+ iconv_close(cd);],
3171+ [am_cv_func_iconv=yes])
3172+ if test "$am_cv_func_iconv" != yes; then
3173+ am_save_LIBS="$LIBS"
3174+ LIBS="$LIBS $LIBICONV"
3175+ AC_TRY_LINK([#include <stdlib.h>
3176+#include <iconv.h>],
3177+ [iconv_t cd = iconv_open("","");
3178+ iconv(cd,NULL,NULL,NULL,NULL);
3179+ iconv_close(cd);],
3180+ [am_cv_lib_iconv=yes]
3181+ [am_cv_func_iconv=yes])
3182+ LIBS="$am_save_LIBS"
3183+ fi
3184+ ])
3185+ if test "$am_cv_func_iconv" = yes; then
3186+ AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
3187+ dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
3188+ am_save_LIBS="$LIBS"
3189+ if test $am_cv_lib_iconv = yes; then
3190+ LIBS="$LIBS $LIBICONV"
3191+ fi
3192+ AC_TRY_RUN([
3193+#include <iconv.h>
3194+#include <string.h>
3195+int main ()
3196+{
3197+ /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
3198+ returns. */
3199+ {
3200+ iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
3201+ if (cd_utf8_to_88591 != (iconv_t)(-1))
3202+ {
3203+ static const char input[] = "\342\202\254"; /* EURO SIGN */
3204+ char buf[10];
3205+ const char *inptr = input;
3206+ size_t inbytesleft = strlen (input);
3207+ char *outptr = buf;
3208+ size_t outbytesleft = sizeof (buf);
3209+ size_t res = iconv (cd_utf8_to_88591,
3210+ (char **) &inptr, &inbytesleft,
3211+ &outptr, &outbytesleft);
3212+ if (res == 0)
3213+ return 1;
3214+ }
3215+ }
3216+ /* Test against Solaris 10 bug: Failures are not distinguishable from
3217+ successful returns. */
3218+ {
3219+ iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
3220+ if (cd_ascii_to_88591 != (iconv_t)(-1))
3221+ {
3222+ static const char input[] = "\263";
3223+ char buf[10];
3224+ const char *inptr = input;
3225+ size_t inbytesleft = strlen (input);
3226+ char *outptr = buf;
3227+ size_t outbytesleft = sizeof (buf);
3228+ size_t res = iconv (cd_ascii_to_88591,
3229+ (char **) &inptr, &inbytesleft,
3230+ &outptr, &outbytesleft);
3231+ if (res == 0)
3232+ return 1;
3233+ }
3234+ }
3235+#if 0 /* This bug could be worked around by the caller. */
3236+ /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
3237+ {
3238+ iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
3239+ if (cd_88591_to_utf8 != (iconv_t)(-1))
3240+ {
3241+ static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
3242+ char buf[50];
3243+ const char *inptr = input;
3244+ size_t inbytesleft = strlen (input);
3245+ char *outptr = buf;
3246+ size_t outbytesleft = sizeof (buf);
3247+ size_t res = iconv (cd_88591_to_utf8,
3248+ (char **) &inptr, &inbytesleft,
3249+ &outptr, &outbytesleft);
3250+ if ((int)res > 0)
3251+ return 1;
3252+ }
3253+ }
3254+#endif
3255+ /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
3256+ provided. */
3257+ if (/* Try standardized names. */
3258+ iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
3259+ /* Try IRIX, OSF/1 names. */
3260+ && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
3261+ /* Try AIX names. */
3262+ && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
3263+ /* Try HP-UX names. */
3264+ && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
3265+ return 1;
3266+ return 0;
3267+}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
3268+ [case "$host_os" in
3269+ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
3270+ *) am_cv_func_iconv_works="guessing yes" ;;
3271+ esac])
3272+ LIBS="$am_save_LIBS"
3273+ ])
3274+ case "$am_cv_func_iconv_works" in
3275+ *no) am_func_iconv=no am_cv_lib_iconv=no ;;
3276+ *) am_func_iconv=yes ;;
3277+ esac
3278+ else
3279+ am_func_iconv=no am_cv_lib_iconv=no
3280+ fi
3281+ if test "$am_func_iconv" = yes; then
3282+ AC_DEFINE([HAVE_ICONV], [1],
3283+ [Define if you have the iconv() function and it works.])
3284+ fi
3285+ if test "$am_cv_lib_iconv" = yes; then
3286+ AC_MSG_CHECKING([how to link with libiconv])
3287+ AC_MSG_RESULT([$LIBICONV])
3288+ else
3289+ dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
3290+ dnl either.
3291+ CPPFLAGS="$am_save_CPPFLAGS"
3292+ LIBICONV=
3293+ LTLIBICONV=
3294+ fi
3295+ AC_SUBST([LIBICONV])
3296+ AC_SUBST([LTLIBICONV])
3297+])
3298+
3299+AC_DEFUN([AM_ICONV],
3300+[
3301+ AM_ICONV_LINK
3302+ if test "$am_cv_func_iconv" = yes; then
3303+ AC_MSG_CHECKING([for iconv declaration])
3304+ AC_CACHE_VAL([am_cv_proto_iconv], [
3305+ AC_TRY_COMPILE([
3306+#include <stdlib.h>
3307+#include <iconv.h>
3308+extern
3309+#ifdef __cplusplus
3310+"C"
3311+#endif
3312+#if defined(__STDC__) || defined(__cplusplus)
3313+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
3314+#else
3315+size_t iconv();
3316+#endif
3317+], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
3318+ 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);"])
3319+ am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
3320+ AC_MSG_RESULT([
3321+ $am_cv_proto_iconv])
3322+ AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
3323+ [Define as const if the declaration of iconv() needs const.])
3324+ fi
3325+])
3326
3327=== added file 'build/autotools/intlmacosx.m4'
3328--- build/autotools/intlmacosx.m4 1970-01-01 00:00:00 +0000
3329+++ build/autotools/intlmacosx.m4 2011-06-20 20:11:46 +0000
3330@@ -0,0 +1,51 @@
3331+# intlmacosx.m4 serial 3 (gettext-0.18)
3332+dnl Copyright (C) 2004-2010 Free Software Foundation, Inc.
3333+dnl This file is free software; the Free Software Foundation
3334+dnl gives unlimited permission to copy and/or distribute it,
3335+dnl with or without modifications, as long as this notice is preserved.
3336+dnl
3337+dnl This file can can be used in projects which are not available under
3338+dnl the GNU General Public License or the GNU Library General Public
3339+dnl License but which still want to provide support for the GNU gettext
3340+dnl functionality.
3341+dnl Please note that the actual code of the GNU gettext library is covered
3342+dnl by the GNU Library General Public License, and the rest of the GNU
3343+dnl gettext package package is covered by the GNU General Public License.
3344+dnl They are *not* in the public domain.
3345+
3346+dnl Checks for special options needed on MacOS X.
3347+dnl Defines INTL_MACOSX_LIBS.
3348+AC_DEFUN([gt_INTL_MACOSX],
3349+[
3350+ dnl Check for API introduced in MacOS X 10.2.
3351+ AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
3352+ [gt_cv_func_CFPreferencesCopyAppValue],
3353+ [gt_save_LIBS="$LIBS"
3354+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
3355+ AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
3356+ [CFPreferencesCopyAppValue(NULL, NULL)],
3357+ [gt_cv_func_CFPreferencesCopyAppValue=yes],
3358+ [gt_cv_func_CFPreferencesCopyAppValue=no])
3359+ LIBS="$gt_save_LIBS"])
3360+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
3361+ AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
3362+ [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
3363+ fi
3364+ dnl Check for API introduced in MacOS X 10.3.
3365+ AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
3366+ [gt_save_LIBS="$LIBS"
3367+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
3368+ AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
3369+ [gt_cv_func_CFLocaleCopyCurrent=yes],
3370+ [gt_cv_func_CFLocaleCopyCurrent=no])
3371+ LIBS="$gt_save_LIBS"])
3372+ if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
3373+ AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
3374+ [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
3375+ fi
3376+ INTL_MACOSX_LIBS=
3377+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
3378+ INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
3379+ fi
3380+ AC_SUBST([INTL_MACOSX_LIBS])
3381+])
3382
3383=== added file 'build/autotools/lib-ld.m4'
3384--- build/autotools/lib-ld.m4 1970-01-01 00:00:00 +0000
3385+++ build/autotools/lib-ld.m4 2011-06-20 20:11:46 +0000
3386@@ -0,0 +1,110 @@
3387+# lib-ld.m4 serial 4 (gettext-0.18)
3388+dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
3389+dnl This file is free software; the Free Software Foundation
3390+dnl gives unlimited permission to copy and/or distribute it,
3391+dnl with or without modifications, as long as this notice is preserved.
3392+
3393+dnl Subroutines of libtool.m4,
3394+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
3395+dnl with libtool.m4.
3396+
3397+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
3398+AC_DEFUN([AC_LIB_PROG_LD_GNU],
3399+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
3400+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
3401+case `$LD -v 2>&1 </dev/null` in
3402+*GNU* | *'with BFD'*)
3403+ acl_cv_prog_gnu_ld=yes ;;
3404+*)
3405+ acl_cv_prog_gnu_ld=no ;;
3406+esac])
3407+with_gnu_ld=$acl_cv_prog_gnu_ld
3408+])
3409+
3410+dnl From libtool-1.4. Sets the variable LD.
3411+AC_DEFUN([AC_LIB_PROG_LD],
3412+[AC_ARG_WITH([gnu-ld],
3413+[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
3414+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
3415+AC_REQUIRE([AC_PROG_CC])dnl
3416+AC_REQUIRE([AC_CANONICAL_HOST])dnl
3417+# Prepare PATH_SEPARATOR.
3418+# The user is always right.
3419+if test "${PATH_SEPARATOR+set}" != set; then
3420+ echo "#! /bin/sh" >conf$$.sh
3421+ echo "exit 0" >>conf$$.sh
3422+ chmod +x conf$$.sh
3423+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
3424+ PATH_SEPARATOR=';'
3425+ else
3426+ PATH_SEPARATOR=:
3427+ fi
3428+ rm -f conf$$.sh
3429+fi
3430+ac_prog=ld
3431+if test "$GCC" = yes; then
3432+ # Check if gcc -print-prog-name=ld gives a path.
3433+ AC_MSG_CHECKING([for ld used by GCC])
3434+ case $host in
3435+ *-*-mingw*)
3436+ # gcc leaves a trailing carriage return which upsets mingw
3437+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
3438+ *)
3439+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
3440+ esac
3441+ case $ac_prog in
3442+ # Accept absolute paths.
3443+ [[\\/]* | [A-Za-z]:[\\/]*)]
3444+ [re_direlt='/[^/][^/]*/\.\./']
3445+ # Canonicalize the path of ld
3446+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
3447+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
3448+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
3449+ done
3450+ test -z "$LD" && LD="$ac_prog"
3451+ ;;
3452+ "")
3453+ # If it fails, then pretend we aren't using GCC.
3454+ ac_prog=ld
3455+ ;;
3456+ *)
3457+ # If it is relative, then search for the first ld in PATH.
3458+ with_gnu_ld=unknown
3459+ ;;
3460+ esac
3461+elif test "$with_gnu_ld" = yes; then
3462+ AC_MSG_CHECKING([for GNU ld])
3463+else
3464+ AC_MSG_CHECKING([for non-GNU ld])
3465+fi
3466+AC_CACHE_VAL([acl_cv_path_LD],
3467+[if test -z "$LD"; then
3468+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
3469+ for ac_dir in $PATH; do
3470+ test -z "$ac_dir" && ac_dir=.
3471+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
3472+ acl_cv_path_LD="$ac_dir/$ac_prog"
3473+ # Check to see if the program is GNU ld. I'd rather use --version,
3474+ # but apparently some GNU ld's only accept -v.
3475+ # Break only if it was the GNU/non-GNU ld that we prefer.
3476+ case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
3477+ *GNU* | *'with BFD'*)
3478+ test "$with_gnu_ld" != no && break ;;
3479+ *)
3480+ test "$with_gnu_ld" != yes && break ;;
3481+ esac
3482+ fi
3483+ done
3484+ IFS="$ac_save_ifs"
3485+else
3486+ acl_cv_path_LD="$LD" # Let the user override the test with a path.
3487+fi])
3488+LD="$acl_cv_path_LD"
3489+if test -n "$LD"; then
3490+ AC_MSG_RESULT([$LD])
3491+else
3492+ AC_MSG_RESULT([no])
3493+fi
3494+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
3495+AC_LIB_PROG_LD_GNU
3496+])
3497
3498=== added file 'build/autotools/lib-link.m4'
3499--- build/autotools/lib-link.m4 1970-01-01 00:00:00 +0000
3500+++ build/autotools/lib-link.m4 2011-06-20 20:11:46 +0000
3501@@ -0,0 +1,774 @@
3502+# lib-link.m4 serial 21 (gettext-0.18)
3503+dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
3504+dnl This file is free software; the Free Software Foundation
3505+dnl gives unlimited permission to copy and/or distribute it,
3506+dnl with or without modifications, as long as this notice is preserved.
3507+
3508+dnl From Bruno Haible.
3509+
3510+AC_PREREQ([2.54])
3511+
3512+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
3513+dnl the libraries corresponding to explicit and implicit dependencies.
3514+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
3515+dnl augments the CPPFLAGS variable.
3516+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
3517+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
3518+AC_DEFUN([AC_LIB_LINKFLAGS],
3519+[
3520+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
3521+ AC_REQUIRE([AC_LIB_RPATH])
3522+ pushdef([Name],[translit([$1],[./-], [___])])
3523+ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
3524+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
3525+ AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
3526+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
3527+ ac_cv_lib[]Name[]_libs="$LIB[]NAME"
3528+ ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
3529+ ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
3530+ ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
3531+ ])
3532+ LIB[]NAME="$ac_cv_lib[]Name[]_libs"
3533+ LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
3534+ INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
3535+ LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
3536+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
3537+ AC_SUBST([LIB]NAME)
3538+ AC_SUBST([LTLIB]NAME)
3539+ AC_SUBST([LIB]NAME[_PREFIX])
3540+ dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
3541+ dnl results of this search when this library appears as a dependency.
3542+ HAVE_LIB[]NAME=yes
3543+ popdef([NAME])
3544+ popdef([Name])
3545+])
3546+
3547+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
3548+dnl searches for libname and the libraries corresponding to explicit and
3549+dnl implicit dependencies, together with the specified include files and
3550+dnl the ability to compile and link the specified testcode. The missing-message
3551+dnl defaults to 'no' and may contain additional hints for the user.
3552+dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
3553+dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
3554+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
3555+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
3556+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
3557+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
3558+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
3559+[
3560+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
3561+ AC_REQUIRE([AC_LIB_RPATH])
3562+ pushdef([Name],[translit([$1],[./-], [___])])
3563+ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
3564+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
3565+
3566+ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
3567+ dnl accordingly.
3568+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
3569+
3570+ dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
3571+ dnl because if the user has installed lib[]Name and not disabled its use
3572+ dnl via --without-lib[]Name-prefix, he wants to use it.
3573+ ac_save_CPPFLAGS="$CPPFLAGS"
3574+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
3575+
3576+ AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
3577+ ac_save_LIBS="$LIBS"
3578+ dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
3579+ dnl because these -l options might require -L options that are present in
3580+ dnl LIBS. -l options benefit only from the -L options listed before it.
3581+ dnl Otherwise, add it to the front of LIBS, because it may be a static
3582+ dnl library that depends on another static library that is present in LIBS.
3583+ dnl Static libraries benefit only from the static libraries listed after
3584+ dnl it.
3585+ case " $LIB[]NAME" in
3586+ *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
3587+ *) LIBS="$LIB[]NAME $LIBS" ;;
3588+ esac
3589+ AC_TRY_LINK([$3], [$4],
3590+ [ac_cv_lib[]Name=yes],
3591+ [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
3592+ LIBS="$ac_save_LIBS"
3593+ ])
3594+ if test "$ac_cv_lib[]Name" = yes; then
3595+ HAVE_LIB[]NAME=yes
3596+ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
3597+ AC_MSG_CHECKING([how to link with lib[]$1])
3598+ AC_MSG_RESULT([$LIB[]NAME])
3599+ else
3600+ HAVE_LIB[]NAME=no
3601+ dnl If $LIB[]NAME didn't lead to a usable library, we don't need
3602+ dnl $INC[]NAME either.
3603+ CPPFLAGS="$ac_save_CPPFLAGS"
3604+ LIB[]NAME=
3605+ LTLIB[]NAME=
3606+ LIB[]NAME[]_PREFIX=
3607+ fi
3608+ AC_SUBST([HAVE_LIB]NAME)
3609+ AC_SUBST([LIB]NAME)
3610+ AC_SUBST([LTLIB]NAME)
3611+ AC_SUBST([LIB]NAME[_PREFIX])
3612+ popdef([NAME])
3613+ popdef([Name])
3614+])
3615+
3616+dnl Determine the platform dependent parameters needed to use rpath:
3617+dnl acl_libext,
3618+dnl acl_shlibext,
3619+dnl acl_hardcode_libdir_flag_spec,
3620+dnl acl_hardcode_libdir_separator,
3621+dnl acl_hardcode_direct,
3622+dnl acl_hardcode_minus_L.
3623+AC_DEFUN([AC_LIB_RPATH],
3624+[
3625+ dnl Tell automake >= 1.10 to complain if config.rpath is missing.
3626+ m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
3627+ AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
3628+ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
3629+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
3630+ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
3631+ AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
3632+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
3633+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
3634+ . ./conftest.sh
3635+ rm -f ./conftest.sh
3636+ acl_cv_rpath=done
3637+ ])
3638+ wl="$acl_cv_wl"
3639+ acl_libext="$acl_cv_libext"
3640+ acl_shlibext="$acl_cv_shlibext"
3641+ acl_libname_spec="$acl_cv_libname_spec"
3642+ acl_library_names_spec="$acl_cv_library_names_spec"
3643+ acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
3644+ acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
3645+ acl_hardcode_direct="$acl_cv_hardcode_direct"
3646+ acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
3647+ dnl Determine whether the user wants rpath handling at all.
3648+ AC_ARG_ENABLE([rpath],
3649+ [ --disable-rpath do not hardcode runtime library paths],
3650+ :, enable_rpath=yes)
3651+])
3652+
3653+dnl AC_LIB_FROMPACKAGE(name, package)
3654+dnl declares that libname comes from the given package. The configure file
3655+dnl will then not have a --with-libname-prefix option but a
3656+dnl --with-package-prefix option. Several libraries can come from the same
3657+dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
3658+dnl macro call that searches for libname.
3659+AC_DEFUN([AC_LIB_FROMPACKAGE],
3660+[
3661+ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
3662+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
3663+ define([acl_frompackage_]NAME, [$2])
3664+ popdef([NAME])
3665+ pushdef([PACK],[$2])
3666+ pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
3667+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
3668+ define([acl_libsinpackage_]PACKUP,
3669+ m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
3670+ popdef([PACKUP])
3671+ popdef([PACK])
3672+])
3673+
3674+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
3675+dnl the libraries corresponding to explicit and implicit dependencies.
3676+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
3677+dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
3678+dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
3679+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
3680+[
3681+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
3682+ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
3683+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
3684+ pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
3685+ pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
3686+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
3687+ pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
3688+ dnl Autoconf >= 2.61 supports dots in --with options.
3689+ pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
3690+ dnl By default, look in $includedir and $libdir.
3691+ use_additional=yes
3692+ AC_LIB_WITH_FINAL_PREFIX([
3693+ eval additional_includedir=\"$includedir\"
3694+ eval additional_libdir=\"$libdir\"
3695+ ])
3696+ AC_ARG_WITH(P_A_C_K[-prefix],
3697+[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
3698+ --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
3699+[
3700+ if test "X$withval" = "Xno"; then
3701+ use_additional=no
3702+ else
3703+ if test "X$withval" = "X"; then
3704+ AC_LIB_WITH_FINAL_PREFIX([
3705+ eval additional_includedir=\"$includedir\"
3706+ eval additional_libdir=\"$libdir\"
3707+ ])
3708+ else
3709+ additional_includedir="$withval/include"
3710+ additional_libdir="$withval/$acl_libdirstem"
3711+ if test "$acl_libdirstem2" != "$acl_libdirstem" \
3712+ && ! test -d "$withval/$acl_libdirstem"; then
3713+ additional_libdir="$withval/$acl_libdirstem2"
3714+ fi
3715+ fi
3716+ fi
3717+])
3718+ dnl Search the library and its dependencies in $additional_libdir and
3719+ dnl $LDFLAGS. Using breadth-first-seach.
3720+ LIB[]NAME=
3721+ LTLIB[]NAME=
3722+ INC[]NAME=
3723+ LIB[]NAME[]_PREFIX=
3724+ dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
3725+ dnl computed. So it has to be reset here.
3726+ HAVE_LIB[]NAME=
3727+ rpathdirs=
3728+ ltrpathdirs=
3729+ names_already_handled=
3730+ names_next_round='$1 $2'
3731+ while test -n "$names_next_round"; do
3732+ names_this_round="$names_next_round"
3733+ names_next_round=
3734+ for name in $names_this_round; do
3735+ already_handled=
3736+ for n in $names_already_handled; do
3737+ if test "$n" = "$name"; then
3738+ already_handled=yes
3739+ break
3740+ fi
3741+ done
3742+ if test -z "$already_handled"; then
3743+ names_already_handled="$names_already_handled $name"
3744+ dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
3745+ dnl or AC_LIB_HAVE_LINKFLAGS call.
3746+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
3747+ eval value=\"\$HAVE_LIB$uppername\"
3748+ if test -n "$value"; then
3749+ if test "$value" = yes; then
3750+ eval value=\"\$LIB$uppername\"
3751+ test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
3752+ eval value=\"\$LTLIB$uppername\"
3753+ test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
3754+ else
3755+ dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
3756+ dnl that this library doesn't exist. So just drop it.
3757+ :
3758+ fi
3759+ else
3760+ dnl Search the library lib$name in $additional_libdir and $LDFLAGS
3761+ dnl and the already constructed $LIBNAME/$LTLIBNAME.
3762+ found_dir=
3763+ found_la=
3764+ found_so=
3765+ found_a=
3766+ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
3767+ if test -n "$acl_shlibext"; then
3768+ shrext=".$acl_shlibext" # typically: shrext=.so
3769+ else
3770+ shrext=
3771+ fi
3772+ if test $use_additional = yes; then
3773+ dir="$additional_libdir"
3774+ dnl The same code as in the loop below:
3775+ dnl First look for a shared library.
3776+ if test -n "$acl_shlibext"; then
3777+ if test -f "$dir/$libname$shrext"; then
3778+ found_dir="$dir"
3779+ found_so="$dir/$libname$shrext"
3780+ else
3781+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
3782+ ver=`(cd "$dir" && \
3783+ for f in "$libname$shrext".*; do echo "$f"; done \
3784+ | sed -e "s,^$libname$shrext\\\\.,," \
3785+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
3786+ | sed 1q ) 2>/dev/null`
3787+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
3788+ found_dir="$dir"
3789+ found_so="$dir/$libname$shrext.$ver"
3790+ fi
3791+ else
3792+ eval library_names=\"$acl_library_names_spec\"
3793+ for f in $library_names; do
3794+ if test -f "$dir/$f"; then
3795+ found_dir="$dir"
3796+ found_so="$dir/$f"
3797+ break
3798+ fi
3799+ done
3800+ fi
3801+ fi
3802+ fi
3803+ dnl Then look for a static library.
3804+ if test "X$found_dir" = "X"; then
3805+ if test -f "$dir/$libname.$acl_libext"; then
3806+ found_dir="$dir"
3807+ found_a="$dir/$libname.$acl_libext"
3808+ fi
3809+ fi
3810+ if test "X$found_dir" != "X"; then
3811+ if test -f "$dir/$libname.la"; then
3812+ found_la="$dir/$libname.la"
3813+ fi
3814+ fi
3815+ fi
3816+ if test "X$found_dir" = "X"; then
3817+ for x in $LDFLAGS $LTLIB[]NAME; do
3818+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
3819+ case "$x" in
3820+ -L*)
3821+ dir=`echo "X$x" | sed -e 's/^X-L//'`
3822+ dnl First look for a shared library.
3823+ if test -n "$acl_shlibext"; then
3824+ if test -f "$dir/$libname$shrext"; then
3825+ found_dir="$dir"
3826+ found_so="$dir/$libname$shrext"
3827+ else
3828+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
3829+ ver=`(cd "$dir" && \
3830+ for f in "$libname$shrext".*; do echo "$f"; done \
3831+ | sed -e "s,^$libname$shrext\\\\.,," \
3832+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
3833+ | sed 1q ) 2>/dev/null`
3834+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
3835+ found_dir="$dir"
3836+ found_so="$dir/$libname$shrext.$ver"
3837+ fi
3838+ else
3839+ eval library_names=\"$acl_library_names_spec\"
3840+ for f in $library_names; do
3841+ if test -f "$dir/$f"; then
3842+ found_dir="$dir"
3843+ found_so="$dir/$f"
3844+ break
3845+ fi
3846+ done
3847+ fi
3848+ fi
3849+ fi
3850+ dnl Then look for a static library.
3851+ if test "X$found_dir" = "X"; then
3852+ if test -f "$dir/$libname.$acl_libext"; then
3853+ found_dir="$dir"
3854+ found_a="$dir/$libname.$acl_libext"
3855+ fi
3856+ fi
3857+ if test "X$found_dir" != "X"; then
3858+ if test -f "$dir/$libname.la"; then
3859+ found_la="$dir/$libname.la"
3860+ fi
3861+ fi
3862+ ;;
3863+ esac
3864+ if test "X$found_dir" != "X"; then
3865+ break
3866+ fi
3867+ done
3868+ fi
3869+ if test "X$found_dir" != "X"; then
3870+ dnl Found the library.
3871+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
3872+ if test "X$found_so" != "X"; then
3873+ dnl Linking with a shared library. We attempt to hardcode its
3874+ dnl directory into the executable's runpath, unless it's the
3875+ dnl standard /usr/lib.
3876+ if test "$enable_rpath" = no \
3877+ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
3878+ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
3879+ dnl No hardcoding is needed.
3880+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
3881+ else
3882+ dnl Use an explicit option to hardcode DIR into the resulting
3883+ dnl binary.
3884+ dnl Potentially add DIR to ltrpathdirs.
3885+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
3886+ haveit=
3887+ for x in $ltrpathdirs; do
3888+ if test "X$x" = "X$found_dir"; then
3889+ haveit=yes
3890+ break
3891+ fi
3892+ done
3893+ if test -z "$haveit"; then
3894+ ltrpathdirs="$ltrpathdirs $found_dir"
3895+ fi
3896+ dnl The hardcoding into $LIBNAME is system dependent.
3897+ if test "$acl_hardcode_direct" = yes; then
3898+ dnl Using DIR/libNAME.so during linking hardcodes DIR into the
3899+ dnl resulting binary.
3900+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
3901+ else
3902+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
3903+ dnl Use an explicit option to hardcode DIR into the resulting
3904+ dnl binary.
3905+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
3906+ dnl Potentially add DIR to rpathdirs.
3907+ dnl The rpathdirs will be appended to $LIBNAME at the end.
3908+ haveit=
3909+ for x in $rpathdirs; do
3910+ if test "X$x" = "X$found_dir"; then
3911+ haveit=yes
3912+ break
3913+ fi
3914+ done
3915+ if test -z "$haveit"; then
3916+ rpathdirs="$rpathdirs $found_dir"
3917+ fi
3918+ else
3919+ dnl Rely on "-L$found_dir".
3920+ dnl But don't add it if it's already contained in the LDFLAGS
3921+ dnl or the already constructed $LIBNAME
3922+ haveit=
3923+ for x in $LDFLAGS $LIB[]NAME; do
3924+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
3925+ if test "X$x" = "X-L$found_dir"; then
3926+ haveit=yes
3927+ break
3928+ fi
3929+ done
3930+ if test -z "$haveit"; then
3931+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
3932+ fi
3933+ if test "$acl_hardcode_minus_L" != no; then
3934+ dnl FIXME: Not sure whether we should use
3935+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
3936+ dnl here.
3937+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
3938+ else
3939+ dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
3940+ dnl here, because this doesn't fit in flags passed to the
3941+ dnl compiler. So give up. No hardcoding. This affects only
3942+ dnl very old systems.
3943+ dnl FIXME: Not sure whether we should use
3944+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
3945+ dnl here.
3946+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
3947+ fi
3948+ fi
3949+ fi
3950+ fi
3951+ else
3952+ if test "X$found_a" != "X"; then
3953+ dnl Linking with a static library.
3954+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
3955+ else
3956+ dnl We shouldn't come here, but anyway it's good to have a
3957+ dnl fallback.
3958+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
3959+ fi
3960+ fi
3961+ dnl Assume the include files are nearby.
3962+ additional_includedir=
3963+ case "$found_dir" in
3964+ */$acl_libdirstem | */$acl_libdirstem/)
3965+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
3966+ if test "$name" = '$1'; then
3967+ LIB[]NAME[]_PREFIX="$basedir"
3968+ fi
3969+ additional_includedir="$basedir/include"
3970+ ;;
3971+ */$acl_libdirstem2 | */$acl_libdirstem2/)
3972+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
3973+ if test "$name" = '$1'; then
3974+ LIB[]NAME[]_PREFIX="$basedir"
3975+ fi
3976+ additional_includedir="$basedir/include"
3977+ ;;
3978+ esac
3979+ if test "X$additional_includedir" != "X"; then
3980+ dnl Potentially add $additional_includedir to $INCNAME.
3981+ dnl But don't add it
3982+ dnl 1. if it's the standard /usr/include,
3983+ dnl 2. if it's /usr/local/include and we are using GCC on Linux,
3984+ dnl 3. if it's already present in $CPPFLAGS or the already
3985+ dnl constructed $INCNAME,
3986+ dnl 4. if it doesn't exist as a directory.
3987+ if test "X$additional_includedir" != "X/usr/include"; then
3988+ haveit=
3989+ if test "X$additional_includedir" = "X/usr/local/include"; then
3990+ if test -n "$GCC"; then
3991+ case $host_os in
3992+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
3993+ esac
3994+ fi
3995+ fi
3996+ if test -z "$haveit"; then
3997+ for x in $CPPFLAGS $INC[]NAME; do
3998+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
3999+ if test "X$x" = "X-I$additional_includedir"; then
4000+ haveit=yes
4001+ break
4002+ fi
4003+ done
4004+ if test -z "$haveit"; then
4005+ if test -d "$additional_includedir"; then
4006+ dnl Really add $additional_includedir to $INCNAME.
4007+ INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
4008+ fi
4009+ fi
4010+ fi
4011+ fi
4012+ fi
4013+ dnl Look for dependencies.
4014+ if test -n "$found_la"; then
4015+ dnl Read the .la file. It defines the variables
4016+ dnl dlname, library_names, old_library, dependency_libs, current,
4017+ dnl age, revision, installed, dlopen, dlpreopen, libdir.
4018+ save_libdir="$libdir"
4019+ case "$found_la" in
4020+ */* | *\\*) . "$found_la" ;;
4021+ *) . "./$found_la" ;;
4022+ esac
4023+ libdir="$save_libdir"
4024+ dnl We use only dependency_libs.
4025+ for dep in $dependency_libs; do
4026+ case "$dep" in
4027+ -L*)
4028+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
4029+ dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
4030+ dnl But don't add it
4031+ dnl 1. if it's the standard /usr/lib,
4032+ dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
4033+ dnl 3. if it's already present in $LDFLAGS or the already
4034+ dnl constructed $LIBNAME,
4035+ dnl 4. if it doesn't exist as a directory.
4036+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
4037+ && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
4038+ haveit=
4039+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
4040+ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
4041+ if test -n "$GCC"; then
4042+ case $host_os in
4043+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
4044+ esac
4045+ fi
4046+ fi
4047+ if test -z "$haveit"; then
4048+ haveit=
4049+ for x in $LDFLAGS $LIB[]NAME; do
4050+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
4051+ if test "X$x" = "X-L$additional_libdir"; then
4052+ haveit=yes
4053+ break
4054+ fi
4055+ done
4056+ if test -z "$haveit"; then
4057+ if test -d "$additional_libdir"; then
4058+ dnl Really add $additional_libdir to $LIBNAME.
4059+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
4060+ fi
4061+ fi
4062+ haveit=
4063+ for x in $LDFLAGS $LTLIB[]NAME; do
4064+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
4065+ if test "X$x" = "X-L$additional_libdir"; then
4066+ haveit=yes
4067+ break
4068+ fi
4069+ done
4070+ if test -z "$haveit"; then
4071+ if test -d "$additional_libdir"; then
4072+ dnl Really add $additional_libdir to $LTLIBNAME.
4073+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
4074+ fi
4075+ fi
4076+ fi
4077+ fi
4078+ ;;
4079+ -R*)
4080+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
4081+ if test "$enable_rpath" != no; then
4082+ dnl Potentially add DIR to rpathdirs.
4083+ dnl The rpathdirs will be appended to $LIBNAME at the end.
4084+ haveit=
4085+ for x in $rpathdirs; do
4086+ if test "X$x" = "X$dir"; then
4087+ haveit=yes
4088+ break
4089+ fi
4090+ done
4091+ if test -z "$haveit"; then
4092+ rpathdirs="$rpathdirs $dir"
4093+ fi
4094+ dnl Potentially add DIR to ltrpathdirs.
4095+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
4096+ haveit=
4097+ for x in $ltrpathdirs; do
4098+ if test "X$x" = "X$dir"; then
4099+ haveit=yes
4100+ break
4101+ fi
4102+ done
4103+ if test -z "$haveit"; then
4104+ ltrpathdirs="$ltrpathdirs $dir"
4105+ fi
4106+ fi
4107+ ;;
4108+ -l*)
4109+ dnl Handle this in the next round.
4110+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
4111+ ;;
4112+ *.la)
4113+ dnl Handle this in the next round. Throw away the .la's
4114+ dnl directory; it is already contained in a preceding -L
4115+ dnl option.
4116+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
4117+ ;;
4118+ *)
4119+ dnl Most likely an immediate library name.
4120+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
4121+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
4122+ ;;
4123+ esac
4124+ done
4125+ fi
4126+ else
4127+ dnl Didn't find the library; assume it is in the system directories
4128+ dnl known to the linker and runtime loader. (All the system
4129+ dnl directories known to the linker should also be known to the
4130+ dnl runtime loader, otherwise the system is severely misconfigured.)
4131+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
4132+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
4133+ fi
4134+ fi
4135+ fi
4136+ done
4137+ done
4138+ if test "X$rpathdirs" != "X"; then
4139+ if test -n "$acl_hardcode_libdir_separator"; then
4140+ dnl Weird platform: only the last -rpath option counts, the user must
4141+ dnl pass all path elements in one option. We can arrange that for a
4142+ dnl single library, but not when more than one $LIBNAMEs are used.
4143+ alldirs=
4144+ for found_dir in $rpathdirs; do
4145+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
4146+ done
4147+ dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
4148+ acl_save_libdir="$libdir"
4149+ libdir="$alldirs"
4150+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
4151+ libdir="$acl_save_libdir"
4152+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
4153+ else
4154+ dnl The -rpath options are cumulative.
4155+ for found_dir in $rpathdirs; do
4156+ acl_save_libdir="$libdir"
4157+ libdir="$found_dir"
4158+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
4159+ libdir="$acl_save_libdir"
4160+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
4161+ done
4162+ fi
4163+ fi
4164+ if test "X$ltrpathdirs" != "X"; then
4165+ dnl When using libtool, the option that works for both libraries and
4166+ dnl executables is -R. The -R options are cumulative.
4167+ for found_dir in $ltrpathdirs; do
4168+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
4169+ done
4170+ fi
4171+ popdef([P_A_C_K])
4172+ popdef([PACKLIBS])
4173+ popdef([PACKUP])
4174+ popdef([PACK])
4175+ popdef([NAME])
4176+])
4177+
4178+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
4179+dnl unless already present in VAR.
4180+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
4181+dnl contains two or three consecutive elements that belong together.
4182+AC_DEFUN([AC_LIB_APPENDTOVAR],
4183+[
4184+ for element in [$2]; do
4185+ haveit=
4186+ for x in $[$1]; do
4187+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
4188+ if test "X$x" = "X$element"; then
4189+ haveit=yes
4190+ break
4191+ fi
4192+ done
4193+ if test -z "$haveit"; then
4194+ [$1]="${[$1]}${[$1]:+ }$element"
4195+ fi
4196+ done
4197+])
4198+
4199+dnl For those cases where a variable contains several -L and -l options
4200+dnl referring to unknown libraries and directories, this macro determines the
4201+dnl necessary additional linker options for the runtime path.
4202+dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
4203+dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
4204+dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
4205+dnl otherwise linking without libtool is assumed.
4206+AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
4207+[
4208+ AC_REQUIRE([AC_LIB_RPATH])
4209+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
4210+ $1=
4211+ if test "$enable_rpath" != no; then
4212+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
4213+ dnl Use an explicit option to hardcode directories into the resulting
4214+ dnl binary.
4215+ rpathdirs=
4216+ next=
4217+ for opt in $2; do
4218+ if test -n "$next"; then
4219+ dir="$next"
4220+ dnl No need to hardcode the standard /usr/lib.
4221+ if test "X$dir" != "X/usr/$acl_libdirstem" \
4222+ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
4223+ rpathdirs="$rpathdirs $dir"
4224+ fi
4225+ next=
4226+ else
4227+ case $opt in
4228+ -L) next=yes ;;
4229+ -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
4230+ dnl No need to hardcode the standard /usr/lib.
4231+ if test "X$dir" != "X/usr/$acl_libdirstem" \
4232+ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
4233+ rpathdirs="$rpathdirs $dir"
4234+ fi
4235+ next= ;;
4236+ *) next= ;;
4237+ esac
4238+ fi
4239+ done
4240+ if test "X$rpathdirs" != "X"; then
4241+ if test -n ""$3""; then
4242+ dnl libtool is used for linking. Use -R options.
4243+ for dir in $rpathdirs; do
4244+ $1="${$1}${$1:+ }-R$dir"
4245+ done
4246+ else
4247+ dnl The linker is used for linking directly.
4248+ if test -n "$acl_hardcode_libdir_separator"; then
4249+ dnl Weird platform: only the last -rpath option counts, the user
4250+ dnl must pass all path elements in one option.
4251+ alldirs=
4252+ for dir in $rpathdirs; do
4253+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
4254+ done
4255+ acl_save_libdir="$libdir"
4256+ libdir="$alldirs"
4257+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
4258+ libdir="$acl_save_libdir"
4259+ $1="$flag"
4260+ else
4261+ dnl The -rpath options are cumulative.
4262+ for dir in $rpathdirs; do
4263+ acl_save_libdir="$libdir"
4264+ libdir="$dir"
4265+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
4266+ libdir="$acl_save_libdir"
4267+ $1="${$1}${$1:+ }$flag"
4268+ done
4269+ fi
4270+ fi
4271+ fi
4272+ fi
4273+ fi
4274+ AC_SUBST([$1])
4275+])
4276
4277=== added file 'build/autotools/lib-prefix.m4'
4278--- build/autotools/lib-prefix.m4 1970-01-01 00:00:00 +0000
4279+++ build/autotools/lib-prefix.m4 2011-06-20 20:11:46 +0000
4280@@ -0,0 +1,224 @@
4281+# lib-prefix.m4 serial 7 (gettext-0.18)
4282+dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
4283+dnl This file is free software; the Free Software Foundation
4284+dnl gives unlimited permission to copy and/or distribute it,
4285+dnl with or without modifications, as long as this notice is preserved.
4286+
4287+dnl From Bruno Haible.
4288+
4289+dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
4290+dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
4291+dnl require excessive bracketing.
4292+ifdef([AC_HELP_STRING],
4293+[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
4294+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
4295+
4296+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
4297+dnl to access previously installed libraries. The basic assumption is that
4298+dnl a user will want packages to use other packages he previously installed
4299+dnl with the same --prefix option.
4300+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
4301+dnl libraries, but is otherwise very convenient.
4302+AC_DEFUN([AC_LIB_PREFIX],
4303+[
4304+ AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
4305+ AC_REQUIRE([AC_PROG_CC])
4306+ AC_REQUIRE([AC_CANONICAL_HOST])
4307+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
4308+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
4309+ dnl By default, look in $includedir and $libdir.
4310+ use_additional=yes
4311+ AC_LIB_WITH_FINAL_PREFIX([
4312+ eval additional_includedir=\"$includedir\"
4313+ eval additional_libdir=\"$libdir\"
4314+ ])
4315+ AC_LIB_ARG_WITH([lib-prefix],
4316+[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
4317+ --without-lib-prefix don't search for libraries in includedir and libdir],
4318+[
4319+ if test "X$withval" = "Xno"; then
4320+ use_additional=no
4321+ else
4322+ if test "X$withval" = "X"; then
4323+ AC_LIB_WITH_FINAL_PREFIX([
4324+ eval additional_includedir=\"$includedir\"
4325+ eval additional_libdir=\"$libdir\"
4326+ ])
4327+ else
4328+ additional_includedir="$withval/include"
4329+ additional_libdir="$withval/$acl_libdirstem"
4330+ fi
4331+ fi
4332+])
4333+ if test $use_additional = yes; then
4334+ dnl Potentially add $additional_includedir to $CPPFLAGS.
4335+ dnl But don't add it
4336+ dnl 1. if it's the standard /usr/include,
4337+ dnl 2. if it's already present in $CPPFLAGS,
4338+ dnl 3. if it's /usr/local/include and we are using GCC on Linux,
4339+ dnl 4. if it doesn't exist as a directory.
4340+ if test "X$additional_includedir" != "X/usr/include"; then
4341+ haveit=
4342+ for x in $CPPFLAGS; do
4343+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
4344+ if test "X$x" = "X-I$additional_includedir"; then
4345+ haveit=yes
4346+ break
4347+ fi
4348+ done
4349+ if test -z "$haveit"; then
4350+ if test "X$additional_includedir" = "X/usr/local/include"; then
4351+ if test -n "$GCC"; then
4352+ case $host_os in
4353+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
4354+ esac
4355+ fi
4356+ fi
4357+ if test -z "$haveit"; then
4358+ if test -d "$additional_includedir"; then
4359+ dnl Really add $additional_includedir to $CPPFLAGS.
4360+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
4361+ fi
4362+ fi
4363+ fi
4364+ fi
4365+ dnl Potentially add $additional_libdir to $LDFLAGS.
4366+ dnl But don't add it
4367+ dnl 1. if it's the standard /usr/lib,
4368+ dnl 2. if it's already present in $LDFLAGS,
4369+ dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
4370+ dnl 4. if it doesn't exist as a directory.
4371+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
4372+ haveit=
4373+ for x in $LDFLAGS; do
4374+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
4375+ if test "X$x" = "X-L$additional_libdir"; then
4376+ haveit=yes
4377+ break
4378+ fi
4379+ done
4380+ if test -z "$haveit"; then
4381+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
4382+ if test -n "$GCC"; then
4383+ case $host_os in
4384+ linux*) haveit=yes;;
4385+ esac
4386+ fi
4387+ fi
4388+ if test -z "$haveit"; then
4389+ if test -d "$additional_libdir"; then
4390+ dnl Really add $additional_libdir to $LDFLAGS.
4391+ LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
4392+ fi
4393+ fi
4394+ fi
4395+ fi
4396+ fi
4397+])
4398+
4399+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
4400+dnl acl_final_exec_prefix, containing the values to which $prefix and
4401+dnl $exec_prefix will expand at the end of the configure script.
4402+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
4403+[
4404+ dnl Unfortunately, prefix and exec_prefix get only finally determined
4405+ dnl at the end of configure.
4406+ if test "X$prefix" = "XNONE"; then
4407+ acl_final_prefix="$ac_default_prefix"
4408+ else
4409+ acl_final_prefix="$prefix"
4410+ fi
4411+ if test "X$exec_prefix" = "XNONE"; then
4412+ acl_final_exec_prefix='${prefix}'
4413+ else
4414+ acl_final_exec_prefix="$exec_prefix"
4415+ fi
4416+ acl_save_prefix="$prefix"
4417+ prefix="$acl_final_prefix"
4418+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
4419+ prefix="$acl_save_prefix"
4420+])
4421+
4422+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
4423+dnl variables prefix and exec_prefix bound to the values they will have
4424+dnl at the end of the configure script.
4425+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
4426+[
4427+ acl_save_prefix="$prefix"
4428+ prefix="$acl_final_prefix"
4429+ acl_save_exec_prefix="$exec_prefix"
4430+ exec_prefix="$acl_final_exec_prefix"
4431+ $1
4432+ exec_prefix="$acl_save_exec_prefix"
4433+ prefix="$acl_save_prefix"
4434+])
4435+
4436+dnl AC_LIB_PREPARE_MULTILIB creates
4437+dnl - a variable acl_libdirstem, containing the basename of the libdir, either
4438+dnl "lib" or "lib64" or "lib/64",
4439+dnl - a variable acl_libdirstem2, as a secondary possible value for
4440+dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
4441+dnl "lib/amd64".
4442+AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
4443+[
4444+ dnl There is no formal standard regarding lib and lib64.
4445+ dnl On glibc systems, the current practice is that on a system supporting
4446+ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
4447+ dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
4448+ dnl the compiler's default mode by looking at the compiler's library search
4449+ dnl path. If at least one of its elements ends in /lib64 or points to a
4450+ dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
4451+ dnl Otherwise we use the default, namely "lib".
4452+ dnl On Solaris systems, the current practice is that on a system supporting
4453+ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
4454+ dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
4455+ dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
4456+ AC_REQUIRE([AC_CANONICAL_HOST])
4457+ acl_libdirstem=lib
4458+ acl_libdirstem2=
4459+ case "$host_os" in
4460+ solaris*)
4461+ dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
4462+ dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
4463+ dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
4464+ dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
4465+ dnl symlink is missing, so we set acl_libdirstem2 too.
4466+ AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
4467+ [AC_EGREP_CPP([sixtyfour bits], [
4468+#ifdef _LP64
4469+sixtyfour bits
4470+#endif
4471+ ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
4472+ ])
4473+ if test $gl_cv_solaris_64bit = yes; then
4474+ acl_libdirstem=lib/64
4475+ case "$host_cpu" in
4476+ sparc*) acl_libdirstem2=lib/sparcv9 ;;
4477+ i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
4478+ esac
4479+ fi
4480+ ;;
4481+ *)
4482+ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
4483+ if test -n "$searchpath"; then
4484+ acl_save_IFS="${IFS= }"; IFS=":"
4485+ for searchdir in $searchpath; do
4486+ if test -d "$searchdir"; then
4487+ case "$searchdir" in
4488+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
4489+ */../ | */.. )
4490+ # Better ignore directories of this form. They are misleading.
4491+ ;;
4492+ *) searchdir=`cd "$searchdir" && pwd`
4493+ case "$searchdir" in
4494+ */lib64 ) acl_libdirstem=lib64 ;;
4495+ esac ;;
4496+ esac
4497+ fi
4498+ done
4499+ IFS="$acl_save_IFS"
4500+ fi
4501+ ;;
4502+ esac
4503+ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
4504+])
4505
4506=== added file 'build/autotools/nls.m4'
4507--- build/autotools/nls.m4 1970-01-01 00:00:00 +0000
4508+++ build/autotools/nls.m4 2011-06-20 20:11:46 +0000
4509@@ -0,0 +1,32 @@
4510+# nls.m4 serial 5 (gettext-0.18)
4511+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
4512+dnl Inc.
4513+dnl This file is free software; the Free Software Foundation
4514+dnl gives unlimited permission to copy and/or distribute it,
4515+dnl with or without modifications, as long as this notice is preserved.
4516+dnl
4517+dnl This file can can be used in projects which are not available under
4518+dnl the GNU General Public License or the GNU Library General Public
4519+dnl License but which still want to provide support for the GNU gettext
4520+dnl functionality.
4521+dnl Please note that the actual code of the GNU gettext library is covered
4522+dnl by the GNU Library General Public License, and the rest of the GNU
4523+dnl gettext package package is covered by the GNU General Public License.
4524+dnl They are *not* in the public domain.
4525+
4526+dnl Authors:
4527+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
4528+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
4529+
4530+AC_PREREQ([2.50])
4531+
4532+AC_DEFUN([AM_NLS],
4533+[
4534+ AC_MSG_CHECKING([whether NLS is requested])
4535+ dnl Default is enabled NLS
4536+ AC_ARG_ENABLE([nls],
4537+ [ --disable-nls do not use Native Language Support],
4538+ USE_NLS=$enableval, USE_NLS=yes)
4539+ AC_MSG_RESULT([$USE_NLS])
4540+ AC_SUBST([USE_NLS])
4541+])
4542
4543=== added file 'build/autotools/po.m4'
4544--- build/autotools/po.m4 1970-01-01 00:00:00 +0000
4545+++ build/autotools/po.m4 2011-06-20 20:11:46 +0000
4546@@ -0,0 +1,449 @@
4547+# po.m4 serial 17 (gettext-0.18)
4548+dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
4549+dnl This file is free software; the Free Software Foundation
4550+dnl gives unlimited permission to copy and/or distribute it,
4551+dnl with or without modifications, as long as this notice is preserved.
4552+dnl
4553+dnl This file can can be used in projects which are not available under
4554+dnl the GNU General Public License or the GNU Library General Public
4555+dnl License but which still want to provide support for the GNU gettext
4556+dnl functionality.
4557+dnl Please note that the actual code of the GNU gettext library is covered
4558+dnl by the GNU Library General Public License, and the rest of the GNU
4559+dnl gettext package package is covered by the GNU General Public License.
4560+dnl They are *not* in the public domain.
4561+
4562+dnl Authors:
4563+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
4564+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
4565+
4566+AC_PREREQ([2.50])
4567+
4568+dnl Checks for all prerequisites of the po subdirectory.
4569+AC_DEFUN([AM_PO_SUBDIRS],
4570+[
4571+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
4572+ AC_REQUIRE([AC_PROG_INSTALL])dnl
4573+ AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
4574+ AC_REQUIRE([AM_NLS])dnl
4575+
4576+ dnl Release version of the gettext macros. This is used to ensure that
4577+ dnl the gettext macros and po/Makefile.in.in are in sync.
4578+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
4579+
4580+ dnl Perform the following tests also if --disable-nls has been given,
4581+ dnl because they are needed for "make dist" to work.
4582+
4583+ dnl Search for GNU msgfmt in the PATH.
4584+ dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
4585+ dnl The second test excludes FreeBSD msgfmt.
4586+ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
4587+ [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
4588+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
4589+ :)
4590+ AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
4591+
4592+ dnl Test whether it is GNU msgfmt >= 0.15.
4593+changequote(,)dnl
4594+ case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
4595+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
4596+ *) MSGFMT_015=$MSGFMT ;;
4597+ esac
4598+changequote([,])dnl
4599+ AC_SUBST([MSGFMT_015])
4600+changequote(,)dnl
4601+ case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
4602+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
4603+ *) GMSGFMT_015=$GMSGFMT ;;
4604+ esac
4605+changequote([,])dnl
4606+ AC_SUBST([GMSGFMT_015])
4607+
4608+ dnl Search for GNU xgettext 0.12 or newer in the PATH.
4609+ dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
4610+ dnl The second test excludes FreeBSD xgettext.
4611+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
4612+ [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
4613+ (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)],
4614+ :)
4615+ dnl Remove leftover from FreeBSD xgettext call.
4616+ rm -f messages.po
4617+
4618+ dnl Test whether it is GNU xgettext >= 0.15.
4619+changequote(,)dnl
4620+ case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
4621+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
4622+ *) XGETTEXT_015=$XGETTEXT ;;
4623+ esac
4624+changequote([,])dnl
4625+ AC_SUBST([XGETTEXT_015])
4626+
4627+ dnl Search for GNU msgmerge 0.11 or newer in the PATH.
4628+ AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
4629+ [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
4630+
4631+ dnl Installation directories.
4632+ dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
4633+ dnl have to define it here, so that it can be used in po/Makefile.
4634+ test -n "$localedir" || localedir='${datadir}/locale'
4635+ AC_SUBST([localedir])
4636+
4637+ dnl Support for AM_XGETTEXT_OPTION.
4638+ test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
4639+ AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
4640+
4641+ AC_CONFIG_COMMANDS([po-directories], [[
4642+ for ac_file in $CONFIG_FILES; do
4643+ # Support "outfile[:infile[:infile...]]"
4644+ case "$ac_file" in
4645+ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
4646+ esac
4647+ # PO directories have a Makefile.in generated from Makefile.in.in.
4648+ case "$ac_file" in */Makefile.in)
4649+ # Adjust a relative srcdir.
4650+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
4651+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
4652+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
4653+ # In autoconf-2.13 it is called $ac_given_srcdir.
4654+ # In autoconf-2.50 it is called $srcdir.
4655+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
4656+ case "$ac_given_srcdir" in
4657+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
4658+ /*) top_srcdir="$ac_given_srcdir" ;;
4659+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
4660+ esac
4661+ # Treat a directory as a PO directory if and only if it has a
4662+ # POTFILES.in file. This allows packages to have multiple PO
4663+ # directories under different names or in different locations.
4664+ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
4665+ rm -f "$ac_dir/POTFILES"
4666+ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
4667+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
4668+ POMAKEFILEDEPS="POTFILES.in"
4669+ # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
4670+ # on $ac_dir but don't depend on user-specified configuration
4671+ # parameters.
4672+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
4673+ # The LINGUAS file contains the set of available languages.
4674+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
4675+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
4676+ fi
4677+ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
4678+ # Hide the ALL_LINGUAS assigment from automake < 1.5.
4679+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
4680+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
4681+ else
4682+ # The set of available languages was given in configure.in.
4683+ # Hide the ALL_LINGUAS assigment from automake < 1.5.
4684+ eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
4685+ fi
4686+ # Compute POFILES
4687+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
4688+ # Compute UPDATEPOFILES
4689+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
4690+ # Compute DUMMYPOFILES
4691+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
4692+ # Compute GMOFILES
4693+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
4694+ case "$ac_given_srcdir" in
4695+ .) srcdirpre= ;;
4696+ *) srcdirpre='$(srcdir)/' ;;
4697+ esac
4698+ POFILES=
4699+ UPDATEPOFILES=
4700+ DUMMYPOFILES=
4701+ GMOFILES=
4702+ for lang in $ALL_LINGUAS; do
4703+ POFILES="$POFILES $srcdirpre$lang.po"
4704+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
4705+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
4706+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
4707+ done
4708+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
4709+ # environment variable.
4710+ INST_LINGUAS=
4711+ if test -n "$ALL_LINGUAS"; then
4712+ for presentlang in $ALL_LINGUAS; do
4713+ useit=no
4714+ if test "%UNSET%" != "$LINGUAS"; then
4715+ desiredlanguages="$LINGUAS"
4716+ else
4717+ desiredlanguages="$ALL_LINGUAS"
4718+ fi
4719+ for desiredlang in $desiredlanguages; do
4720+ # Use the presentlang catalog if desiredlang is
4721+ # a. equal to presentlang, or
4722+ # b. a variant of presentlang (because in this case,
4723+ # presentlang can be used as a fallback for messages
4724+ # which are not translated in the desiredlang catalog).
4725+ case "$desiredlang" in
4726+ "$presentlang"*) useit=yes;;
4727+ esac
4728+ done
4729+ if test $useit = yes; then
4730+ INST_LINGUAS="$INST_LINGUAS $presentlang"
4731+ fi
4732+ done
4733+ fi
4734+ CATALOGS=
4735+ if test -n "$INST_LINGUAS"; then
4736+ for lang in $INST_LINGUAS; do
4737+ CATALOGS="$CATALOGS $lang.gmo"
4738+ done
4739+ fi
4740+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
4741+ 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"
4742+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
4743+ if test -f "$f"; then
4744+ case "$f" in
4745+ *.orig | *.bak | *~) ;;
4746+ *) cat "$f" >> "$ac_dir/Makefile" ;;
4747+ esac
4748+ fi
4749+ done
4750+ fi
4751+ ;;
4752+ esac
4753+ done]],
4754+ [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
4755+ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
4756+ # from automake < 1.5.
4757+ eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
4758+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
4759+ LINGUAS="${LINGUAS-%UNSET%}"
4760+ ])
4761+])
4762+
4763+dnl Postprocesses a Makefile in a directory containing PO files.
4764+AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
4765+[
4766+ # When this code is run, in config.status, two variables have already been
4767+ # set:
4768+ # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
4769+ # - LINGUAS is the value of the environment variable LINGUAS at configure
4770+ # time.
4771+
4772+changequote(,)dnl
4773+ # Adjust a relative srcdir.
4774+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
4775+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
4776+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
4777+ # In autoconf-2.13 it is called $ac_given_srcdir.
4778+ # In autoconf-2.50 it is called $srcdir.
4779+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
4780+ case "$ac_given_srcdir" in
4781+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
4782+ /*) top_srcdir="$ac_given_srcdir" ;;
4783+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
4784+ esac
4785+
4786+ # Find a way to echo strings without interpreting backslash.
4787+ if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
4788+ gt_echo='echo'
4789+ else
4790+ if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
4791+ gt_echo='printf %s\n'
4792+ else
4793+ echo_func () {
4794+ cat <<EOT
4795+$*
4796+EOT
4797+ }
4798+ gt_echo='echo_func'
4799+ fi
4800+ fi
4801+
4802+ # A sed script that extracts the value of VARIABLE from a Makefile.
4803+ sed_x_variable='
4804+# Test if the hold space is empty.
4805+x
4806+s/P/P/
4807+x
4808+ta
4809+# Yes it was empty. Look if we have the expected variable definition.
4810+/^[ ]*VARIABLE[ ]*=/{
4811+ # Seen the first line of the variable definition.
4812+ s/^[ ]*VARIABLE[ ]*=//
4813+ ba
4814+}
4815+bd
4816+:a
4817+# Here we are processing a line from the variable definition.
4818+# Remove comment, more precisely replace it with a space.
4819+s/#.*$/ /
4820+# See if the line ends in a backslash.
4821+tb
4822+:b
4823+s/\\$//
4824+# Print the line, without the trailing backslash.
4825+p
4826+tc
4827+# There was no trailing backslash. The end of the variable definition is
4828+# reached. Clear the hold space.
4829+s/^.*$//
4830+x
4831+bd
4832+:c
4833+# A trailing backslash means that the variable definition continues in the
4834+# next line. Put a nonempty string into the hold space to indicate this.
4835+s/^.*$/P/
4836+x
4837+:d
4838+'
4839+changequote([,])dnl
4840+
4841+ # Set POTFILES to the value of the Makefile variable POTFILES.
4842+ sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
4843+ POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
4844+ # Compute POTFILES_DEPS as
4845+ # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
4846+ POTFILES_DEPS=
4847+ for file in $POTFILES; do
4848+ POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
4849+ done
4850+ POMAKEFILEDEPS=""
4851+
4852+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
4853+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
4854+ fi
4855+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
4856+ # The LINGUAS file contains the set of available languages.
4857+ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
4858+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
4859+ else
4860+ # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
4861+ sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
4862+ ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
4863+ fi
4864+ # Hide the ALL_LINGUAS assigment from automake < 1.5.
4865+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
4866+ # Compute POFILES
4867+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
4868+ # Compute UPDATEPOFILES
4869+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
4870+ # Compute DUMMYPOFILES
4871+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
4872+ # Compute GMOFILES
4873+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
4874+ # Compute PROPERTIESFILES
4875+ # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
4876+ # Compute CLASSFILES
4877+ # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
4878+ # Compute QMFILES
4879+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
4880+ # Compute MSGFILES
4881+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
4882+ # Compute RESOURCESDLLFILES
4883+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
4884+ case "$ac_given_srcdir" in
4885+ .) srcdirpre= ;;
4886+ *) srcdirpre='$(srcdir)/' ;;
4887+ esac
4888+ POFILES=
4889+ UPDATEPOFILES=
4890+ DUMMYPOFILES=
4891+ GMOFILES=
4892+ PROPERTIESFILES=
4893+ CLASSFILES=
4894+ QMFILES=
4895+ MSGFILES=
4896+ RESOURCESDLLFILES=
4897+ for lang in $ALL_LINGUAS; do
4898+ POFILES="$POFILES $srcdirpre$lang.po"
4899+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
4900+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
4901+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
4902+ PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
4903+ CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
4904+ QMFILES="$QMFILES $srcdirpre$lang.qm"
4905+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
4906+ MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
4907+ 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/'`
4908+ RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
4909+ done
4910+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
4911+ # environment variable.
4912+ INST_LINGUAS=
4913+ if test -n "$ALL_LINGUAS"; then
4914+ for presentlang in $ALL_LINGUAS; do
4915+ useit=no
4916+ if test "%UNSET%" != "$LINGUAS"; then
4917+ desiredlanguages="$LINGUAS"
4918+ else
4919+ desiredlanguages="$ALL_LINGUAS"
4920+ fi
4921+ for desiredlang in $desiredlanguages; do
4922+ # Use the presentlang catalog if desiredlang is
4923+ # a. equal to presentlang, or
4924+ # b. a variant of presentlang (because in this case,
4925+ # presentlang can be used as a fallback for messages
4926+ # which are not translated in the desiredlang catalog).
4927+ case "$desiredlang" in
4928+ "$presentlang"*) useit=yes;;
4929+ esac
4930+ done
4931+ if test $useit = yes; then
4932+ INST_LINGUAS="$INST_LINGUAS $presentlang"
4933+ fi
4934+ done
4935+ fi
4936+ CATALOGS=
4937+ JAVACATALOGS=
4938+ QTCATALOGS=
4939+ TCLCATALOGS=
4940+ CSHARPCATALOGS=
4941+ if test -n "$INST_LINGUAS"; then
4942+ for lang in $INST_LINGUAS; do
4943+ CATALOGS="$CATALOGS $lang.gmo"
4944+ JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
4945+ QTCATALOGS="$QTCATALOGS $lang.qm"
4946+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
4947+ TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
4948+ 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/'`
4949+ CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
4950+ done
4951+ fi
4952+
4953+ 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"
4954+ if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
4955+ # Add dependencies that cannot be formulated as a simple suffix rule.
4956+ for lang in $ALL_LINGUAS; do
4957+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
4958+ cat >> "$ac_file.tmp" <<EOF
4959+$frobbedlang.msg: $lang.po
4960+ @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
4961+ \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
4962+EOF
4963+ done
4964+ fi
4965+ if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
4966+ # Add dependencies that cannot be formulated as a simple suffix rule.
4967+ for lang in $ALL_LINGUAS; do
4968+ 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/'`
4969+ cat >> "$ac_file.tmp" <<EOF
4970+$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
4971+ @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
4972+ \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
4973+EOF
4974+ done
4975+ fi
4976+ if test -n "$POMAKEFILEDEPS"; then
4977+ cat >> "$ac_file.tmp" <<EOF
4978+Makefile: $POMAKEFILEDEPS
4979+EOF
4980+ fi
4981+ mv "$ac_file.tmp" "$ac_file"
4982+])
4983+
4984+dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
4985+AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
4986+[
4987+ XGETTEXT_EXTRA_OPTIONS=
4988+])
4989+
4990+dnl Registers an option to be passed to xgettext in the po subdirectory.
4991+AC_DEFUN([AM_XGETTEXT_OPTION],
4992+[
4993+ AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
4994+ XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
4995+])
4996
4997=== added file 'build/autotools/progtest.m4'
4998--- build/autotools/progtest.m4 1970-01-01 00:00:00 +0000
4999+++ build/autotools/progtest.m4 2011-06-20 20:11:46 +0000
5000@@ -0,0 +1,92 @@
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: