From 2a1fb38cc9eba0d13a77da4b60461e135397ad1c Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Sun, 9 Dec 2012 17:52:36 -0800 Subject: [PATCH] Imported Upstream version 0.15.2 --- ChangeLog | 1590 ++++++++----- Makefile.am | 26 +- Makefile.in | 118 +- NEWS | 12 +- README | 103 - aclocal.m4 | 2507 ++++++++++---------- build/Makefile.in | 35 +- build/autotools/Makefile.am | 1 - build/autotools/Makefile.am.gcov | 35 - build/autotools/Makefile.in | 36 +- build/autotools/libtool.m4 | 265 ++- build/autotools/ltoptions.m4 | 19 +- build/autotools/ltversion.m4 | 10 +- build/compile | 195 +- build/config.guess | 245 +- build/config.sub | 189 +- build/depcomp | 74 +- build/install-sh | 29 +- build/ltmain.sh | 95 +- build/missing | 53 +- build/win32/Makefile.in | 35 +- build/win32/config.h.win32 | 4 +- build/win32/vs10/Makefile.in | 35 +- build/win32/vs10/json-glib.props | 4 +- build/win32/vs10/json-glib.vcxproj | 3 +- build/win32/vs10/json-glib.vcxproj.filters | 3 +- build/win32/vs9/Makefile.in | 35 +- build/win32/vs9/json-glib.vcproj | 3 +- build/win32/vs9/json-glib.vsprops | 4 +- config.h.in | 3 + configure | 543 ++++- configure.ac | 131 +- doc/Makefile.in | 35 +- doc/reference/Makefile.in | 40 +- doc/reference/html/JsonBuilder.html | 24 +- doc/reference/html/JsonGenerator.html | 10 +- doc/reference/html/JsonParser.html | 18 +- doc/reference/html/JsonPath.html | 4 +- doc/reference/html/JsonReader.html | 10 +- doc/reference/html/ch01.html | 2 +- doc/reference/html/ch02.html | 2 +- doc/reference/html/ch03.html | 2 +- doc/reference/html/ch04.html | 2 +- doc/reference/html/index.html | 4 +- doc/reference/html/ix01.html | 2 +- doc/reference/html/ix02.html | 2 +- doc/reference/html/ix03.html | 2 +- doc/reference/html/ix04.html | 2 +- doc/reference/html/ix05.html | 2 +- doc/reference/html/ix06.html | 2 +- doc/reference/html/ix07.html | 2 +- doc/reference/html/ix08.html | 2 +- .../html/json-glib-Boxed-Types-Serialization.html | 2 +- .../html/json-glib-GObject-Serialization.html | 12 +- .../html/json-glib-JSON-GVariant-Integration.html | 22 +- doc/reference/html/json-glib-JSON-Node.html | 4 +- doc/reference/html/json-glib-JSON-Object.html | 4 +- .../html/json-glib-Serializable-Interface.html | 2 +- .../html/json-glib-Versioning-information.html | 6 +- doc/reference/json-glib-sections.txt | 2 + doc/reference/version.xml | 2 +- gtk-doc.make | 4 +- json-glib/Json-1.0.gir | 351 +-- json-glib/Makefile.am | 23 +- json-glib/Makefile.in | 337 +-- json-glib/abicheck.sh | 6 + json-glib/json-glib.symbols | 21 +- json-glib/json-gobject.h | 9 +- json-glib/json-node.c | 186 +- json-glib/json-path.c | 27 +- json-glib/json-scanner.h | 21 + json-glib/json-types-private.h | 80 +- json-glib/json-types.h | 13 +- json-glib/json-value.c | 216 ++ json-glib/json-version.h | 6 +- json-glib/tests/Makefile.in | 89 +- json-glib/tests/node.c | 131 +- json-glib/tests/object.c | 2 + po/cs.gmo | Bin 0 -> 4170 bytes po/cs.po | 167 ++ po/de.gmo | Bin 0 -> 4314 bytes po/de.po | 175 ++ po/el.gmo | Bin 0 -> 5379 bytes po/el.po | 179 ++ po/es.gmo | Bin 0 -> 4198 bytes po/es.po | 173 ++ po/gl.gmo | Bin 0 -> 4135 bytes po/gl.po | 169 ++ po/id.gmo | Bin 0 -> 4069 bytes po/id.po | 170 ++ po/it.gmo | Bin 0 -> 4136 bytes po/it.po | 173 ++ po/json-glib-1.0.pot | 16 +- po/nb.gmo | Bin 0 -> 1538 bytes po/nb.po | 166 ++ po/pa.gmo | Bin 0 -> 1521 bytes po/pa.po | 168 ++ po/pl.gmo | Bin 4317 -> 4317 bytes po/pl.po | 14 +- po/pt_BR.gmo | Bin 0 -> 4153 bytes po/pt_BR.po | 170 ++ po/ru.gmo | Bin 0 -> 5233 bytes po/ru.po | 170 ++ po/sl.gmo | Bin 0 -> 4209 bytes po/sl.po | 173 ++ po/sv.gmo | Bin 0 -> 2349 bytes po/sv.po | 167 ++ po/tr.gmo | Bin 0 -> 4101 bytes po/tr.po | 169 ++ po/vi.gmo | Bin 0 -> 4217 bytes po/vi.po | 167 ++ 111 files changed, 7519 insertions(+), 3254 deletions(-) delete mode 100644 README delete mode 100644 build/autotools/Makefile.am.gcov mode change 100755 => 100644 build/ltmain.sh create mode 100755 json-glib/abicheck.sh create mode 100644 json-glib/json-value.c create mode 100644 po/cs.gmo create mode 100644 po/cs.po create mode 100644 po/de.gmo create mode 100644 po/de.po create mode 100644 po/el.gmo create mode 100644 po/el.po create mode 100644 po/es.gmo create mode 100644 po/es.po create mode 100644 po/gl.gmo create mode 100644 po/gl.po create mode 100644 po/id.gmo create mode 100644 po/id.po create mode 100644 po/it.gmo create mode 100644 po/it.po create mode 100644 po/nb.gmo create mode 100644 po/nb.po create mode 100644 po/pa.gmo create mode 100644 po/pa.po create mode 100644 po/pt_BR.gmo create mode 100644 po/pt_BR.po create mode 100644 po/ru.gmo create mode 100644 po/ru.po create mode 100644 po/sl.gmo create mode 100644 po/sl.po create mode 100644 po/sv.gmo create mode 100644 po/sv.po create mode 100644 po/tr.gmo create mode 100644 po/tr.po create mode 100644 po/vi.gmo create mode 100644 po/vi.po diff --git a/ChangeLog b/ChangeLog index bf84356..4c2f43c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,90 +1,516 @@ -commit 6d64c9a4525001700b437af09676013954eb6eb5 +commit 2d129e5d700db4e0932b3cdd0260ab173f13901e +Author: Emmanuele Bassi +Date: Sat Jun 30 15:19:49 2012 +0100 + + Release JSON-GLib 0.15.2 (snapshot) + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4bb7b70c1ec13eb67b3984b684b2ca45b340ee9b +Author: Emmanuele Bassi +Date: Sat Jun 30 15:19:07 2012 +0100 + + docs: Add missing symbols + + The deprecation macros should be in the private section. + + doc/reference/json-glib-sections.txt | 2 ++ + 1 file changed, 2 insertions(+) + +commit 9c5c46228d67884a0c26557f7471c5c24da14baa +Author: Emmanuele Bassi +Date: Sat Jun 30 15:04:58 2012 +0100 + + NEWS: Update + + NEWS | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit 460a9f3e290be0d5139571492c54ce2b7078cb1f +Author: Emmanuele Bassi +Date: Sat Jun 30 15:04:16 2012 +0100 + + build: Drop dependency on gnome-autogen.sh + + Use autoreconf instead. + + autogen.sh | 49 ++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 40 insertions(+), 9 deletions(-) + +commit c6011722e55c9f03fa43e213b467ee3c1b89b2ef +Author: Emmanuele Bassi +Date: Sat Jun 30 14:52:31 2012 +0100 + + symbols: Add missing functions + + json-glib/json-glib.symbols | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +commit f91117fcc066fb20204aa34c979d7fb199f0f38a +Author: Emmanuele Bassi +Date: Sat Jun 30 14:50:51 2012 +0100 + + build: Add abicheck.sh + + The abicheck.sh script is used to check that the actural ABI we expose + in our shared library is the same as the expected one we encode inside + the json-glib.symbols file. + + Using abicheck.sh at check time, we can verify that: a) the symbols file + is up to date and b) we're not unintentionally leaking private symbols + to the outside world. + + configure.ac | 13 ++++++++++++- + json-glib/Makefile.am | 6 ++++++ + json-glib/abicheck.sh | 6 ++++++ + 3 files changed, 24 insertions(+), 1 deletion(-) + +commit d52cd977c725f7f8aa22eef91b6305255357eaf2 +Author: Emmanuele Bassi +Date: Sat Jun 30 14:49:42 2012 +0100 + + scanner: Mark all symbols as internal + + The JsonScanner API is purely internal; the symbols it exposes should + not end up in the shared library ABI. + + json-glib/json-scanner.h | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +commit b6aad8b53e9250c6b7e9c8c7302c5f8bde3a2c72 +Author: Emmanuele Bassi +Date: Sat Jun 30 14:39:13 2012 +0100 + + Improve test coverage + + json-glib/json-node.c | 9 ++++----- + json-glib/tests/node.c | 18 ++++++++++++++++++ + json-glib/tests/object.c | 2 ++ + 3 files changed, 24 insertions(+), 5 deletions(-) + +commit 9fd65a138d6ec46b94eaf807f9c87ea5ada11cf0 +Author: Emmanuele Bassi +Date: Sat Jun 30 14:04:31 2012 +0100 + + Use lcov instead of gcov for test coverage reports + + With lcov we get nicer reporting tools, with HTML output. + + .gitignore | 2 + + Makefile.am | 26 ++++++++- + README.md | 1 + + build/autotools/Makefile.am | 1 - + build/autotools/Makefile.am.gcov | 35 ------------ + configure.ac | 112 +++++++++++++++++++++++++++++++------- + json-glib/Makefile.am | 7 +-- + 7 files changed, 120 insertions(+), 64 deletions(-) + +commit c135d9ea1b143382fe1372be547cf5ea76444445 +Author: Emmanuele Bassi +Date: Sat Jun 30 13:45:53 2012 +0100 + + tests: Add more coverage to JsonNode + + json-glib/tests/node.c | 113 +++++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 107 insertions(+), 6 deletions(-) + +commit c836800166f2b40e605bb497d7d6e884ae85254c +Author: Emmanuele Bassi +Date: Sat Jun 30 13:26:04 2012 +0100 + + node: Replace GValue with JsonValue + + Given our needs, GValue is terribly overengineered. We do not need + transformability, and we only have four types of data which won't be + extended. At the same time, GValue is lacking: it can only be copied + around, whereas everything else inside a JsonNode is reference counted. + + We can now use the newly introduced JsonValue to replace our usage of + GValue to store values inside a JsonNode, giving us a simpler, reference + counted storage type. + + json-glib/json-node.c | 177 +++++++++++++++++++--------------------- + json-glib/json-types-private.h | 2 +- + 2 files changed, 83 insertions(+), 96 deletions(-) + +commit 7bd24bd628df97d216436e03237fc27f85a6aa8b +Author: Emmanuele Bassi +Date: Sat Jun 30 13:22:47 2012 +0100 + + Add JsonValue + + Given its ECMAScript inheritance, JSON allows only four types of values: + + - integer numbers + - floating point numbers + - booleans + - strings + + We can efficiently represent a JSON value using a simple, reference + counted structure, that behaves similarly to GValue but without the + baggage of the whole type system. + + For the time being, we should keep the whole JsonValue internal: we + already specify typed public accessors, so there's no need to complicate + the API any further. + + json-glib/Makefile.am | 5 +- + json-glib/json-types-private.h | 78 ++++++++++++++- + json-glib/json-value.c | 216 ++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 296 insertions(+), 3 deletions(-) + +commit a62619788bbcc9035fb36e58308b28829f5650d3 +Author: Nguyễn Thái Ngọc Duy +Date: Sat Jun 30 10:27:03 2012 +0700 + + Added Vietnamese translation + + po/vi.po | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 166 insertions(+) + +commit 487a67e2469386751eda951222b927c9ffc2fb06 +Author: Dimitris Spingos +Date: Fri Jun 22 00:05:09 2012 +0300 + + Added Greek translation + + po/el.po | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 178 insertions(+) + +commit 59247e9f8b519c97d9e4ebf67b1b117d0c1b4d66 +Author: Yuri Kozlov +Date: Sun Jun 17 20:33:51 2012 +0400 + + Added Russian translation + + po/ru.po | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 170 insertions(+) + +commit 1a7db5b528868bdf73b1e2a648134120a28bfe20 +Author: Colin Walters +Date: Fri Jun 8 11:20:12 2012 -0400 + + path: Pass int width for printf field width, not long + + json-glib/json-path.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 2eb2fc40034496fa517feeb717c3ca114490c31f +Author: Luca Ferretti +Date: Sat May 19 18:49:03 2012 +0200 + + l10n: Added Italian translation + + po/it.po | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 172 insertions(+) + +commit cecb20c5e7955f62a57df802230b80d74b4d51ce +Author: Andika Triwidada +Date: Sat May 19 12:50:25 2012 +0700 + + Moved id.po to proper directory + + id.po | 171 -------------------------------------------------------------- + po/id.po | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 171 insertions(+), 171 deletions(-) + +commit ed9212a8219d0f953a5f73c1b8db099e6e0977d8 +Author: Andika Triwidada +Date: Sat May 19 12:43:48 2012 +0700 + + Added Indonesian translation + + id.po | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 171 insertions(+) + +commit f3fba7486037639d37c4eb58ca9ca1a7702737ad +Author: A S Alam +Date: Wed May 16 07:32:24 2012 +0530 + + Added Punjabi Translaiton + + po/pa.po | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 169 insertions(+) + +commit a62e8a14314dbe41073c16a88b6e3d2bc491cbc0 +Author: Fran Diéguez +Date: Sat Mar 24 18:03:36 2012 +0100 + + Added Galician translations + + Signed-off-by: Fran Diéguez + + po/gl.po | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 168 insertions(+) + +commit 6f4b0d9286c546658af9cee4fc8c075f4f713ff1 +Author: Chun-wei Fan +Date: Thu Mar 15 16:52:48 2012 +0800 + + Fix "install" paths in VS property sheets + + build/win32/vs10/json-glib.props | 2 +- + build/win32/vs9/json-glib.vsprops | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 2913b0b55481768d5f6dcbbeaa7dbd468cbcf0ac +Author: Gabriel Speckhahn +Date: Thu Feb 16 12:48:35 2012 -0200 + + Updated Brazilian Portuguese translation + + po/pt_BR.po | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 170 insertions(+) + +commit 64fa2598e614163fa1dd71d6d74ea2b71180cd82 +Author: Daniel Nylander +Date: Sun Jan 22 00:38:39 2012 +0100 + + Added Swedish translation + + po/sv.po | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 170 insertions(+) + +commit 31bac4804acba9795cd33d510725ea27a39aac23 +Author: Emmanuele Bassi +Date: Sat Jan 14 22:16:52 2012 +0000 + + Remove JSON_DISABLE_DEPRECATED + + We have deprecations warnings from the compiler, now. + + json-glib/Makefile.am | 2 +- + json-glib/json-glib.symbols | 6 ------ + json-glib/json-gobject.h | 3 --- + json-glib/json-types.h | 2 -- + 4 files changed, 1 insertion(+), 12 deletions(-) + +commit 16f9213dc29390a933b0142ea0a39d44a7a0ab02 +Author: Ryan Lortie +Date: Mon Jan 9 16:16:57 2012 +0100 + + Prevent .po file updates on simple 'make' + + https://bugzilla.gnome.org/show_bug.cgi?id=661128 + + autogen.sh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 424244569257c280c1926deadf266aa564b795ff +Author: Ryan Lortie +Date: Mon Jan 9 16:15:06 2012 +0100 + + autogen.sh: remove out-of-tree check + + Don't verify from autogen.sh that we are in the source tree -- this + breaks out-of-tree builds in a rather direct way. + + https://bugzilla.gnome.org/show_bug.cgi?id=667454 + + autogen.sh | 7 ------- + 1 file changed, 7 deletions(-) + +commit fce3e04b970ec58f9d9a8ba2e5fb9712665ec17b +Author: Matej Urbančič +Date: Mon Dec 26 18:50:43 2011 +0100 + + Updated Slovenian translation + + po/sl.po | 70 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 35 insertions(+), 35 deletions(-) + +commit b9a774d95058ae00aca03b3994f0ffc48cf50699 +Author: Kjartan Maraas +Date: Mon Dec 19 09:46:02 2011 +0100 + + Added Norwegian bokmÃ¥l translation + + po/nb.po | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 165 insertions(+) + +commit 7f343fc7c0571905afe39c06bec19edd56885620 +Author: Daniel Mustieles +Date: Tue Dec 6 20:22:20 2011 +0100 + + Updated Spanish translation + + po/es.po | 29 +++++++++++++++++------------ + 1 file changed, 17 insertions(+), 12 deletions(-) + +commit 0b7a5b7639163573055c569109cbc91ebd77bd77 +Author: Matej Urbančič +Date: Fri Nov 25 18:21:43 2011 +0100 + + Added Slovenian translation + + po/sl.po | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 175 insertions(+) + +commit dab93ffeb85429157851402c51246066f95f25eb +Author: Marek Černocký +Date: Tue Nov 22 10:33:51 2011 +0100 + + Czech translation + + po/cs.po | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 167 insertions(+) + +commit 432f1b2184e0e574f3e09591f540f995a465a326 +Author: Muhammet Kara +Date: Wed Nov 16 12:20:54 2011 +0200 + + [l10n]Added Turkish translation + + po/tr.po | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 170 insertions(+) + +commit 9e4c685e9aa284cf67c4331942edfb8b5ace2c50 +Author: Chun-wei Fan +Date: Tue Nov 15 16:43:28 2011 +0800 + + Fix VS property sheets + + The $(GlibEtcInstallRoot)\include\glib-2.0 needs to be specified in + "AdditionalIncludeDirectories" as well so that we will not mistakenly + pick up glibconfig.h from a GLib version and other GLib headers from + another version accidently. + + build/win32/vs10/json-glib.props | 4 ++-- + build/win32/vs9/json-glib.vsprops | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 89d65bb4c610b87b483b20ebb958043ea1b9d191 +Author: Daniel Mustieles +Date: Mon Nov 14 14:57:27 2011 +0100 + + Updated Spanish translation + + po/es.po | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 167 insertions(+) + +commit 84f987e94a44517a6052b7e91ed2e3c42660e295 +Author: Mario Blättermann +Date: Sun Nov 13 16:53:05 2011 +0100 + + [l10n] Added German translation + + po/de.po | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 172 insertions(+) + +commit 88e5fdd588fe3a70e1e262bc7b414e3e527e21b6 Author: Emmanuele Bassi -Date: Wed Oct 26 12:32:10 2011 +0100 +Date: Fri Nov 11 15:08:08 2011 +0000 - Release JSON-GLib 0.14.2 + docs: Use markdown in the README - NEWS | 5 +++++ - configure.ac | 4 ++-- - 2 files changed, 7 insertions(+), 2 deletions(-) + README | 103 -------------------------------------------------------- + README.md | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 112 insertions(+), 103 deletions(-) -commit 86bf97d993e638f0131fbf17360d03bc7b34e4a0 +commit 7636e9de9414304f940837ee828d23e4608e9f32 Author: Emmanuele Bassi Date: Mon Oct 17 11:19:57 2011 +0100 docs: Fix typo in JsonObject's description https://bugzilla.gnome.org/show_bug.cgi?id=660893 - (cherry picked from commit 7636e9de9414304f940837ee828d23e4608e9f32) - - Signed-off-by: Emmanuele Bassi json-glib/json-object.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2cb5836b99fd4f03e88568de492d1a12841c4176 +Author: Emmanuele Bassi +Date: Mon Oct 17 11:06:38 2011 +0100 + + Bump up the GLib dependency + + It's the development cycle, we can start using GLib 2.31. -commit 45a2f813243652ee2ee82de07348b3218d308861 + configure.ac | 2 +- + json-glib/json-types.h | 6 ------ + 2 files changed, 1 insertion(+), 7 deletions(-) + +commit c2429c07107edd6acf95e80b82d968771c669c35 +Author: Emmanuele Bassi +Date: Mon Oct 17 10:52:43 2011 +0100 + + Use the new GLib deprecation scheme + + Instead of using a defined symbol to remove the deprecated functions + from the library, we should use compiler warnings. + + json-glib/Makefile.am | 1 - + json-glib/json-gobject.h | 6 ++++-- + json-glib/json-types.h | 19 +++++++++++++++++-- + 3 files changed, 21 insertions(+), 5 deletions(-) + +commit f0dad4508b63359123926f699a66aead9c782ce1 +Author: Chun-wei Fan +Date: Mon Oct 17 15:39:40 2011 +0800 + + Update VS property sheets + + Say goodbye to G_DISABLE_DEPRECATED and the build errors that it triggers + as warnings are now issued during the use of deprecated GLib items instead. + + build/win32/vs10/json-glib.props | 2 +- + build/win32/vs9/json-glib.vsprops | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 4ab8059df6ad106bf8958642aa1126925d79128c Author: Emmanuele Bassi Date: Wed Oct 12 12:31:27 2011 +0100 Use g_value_[sg]et_schar() with GLib ≥ 2.31 The non-explicitly signed variant is deprecated. - (cherry picked from commit 4ab8059df6ad106bf8958642aa1126925d79128c) - - Signed-off-by: Emmanuele Bassi json-glib/json-gobject.c | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) + 1 file changed, 9 insertions(+), 1 deletion(-) -commit 692d8275b0d2a7883af4088c95a8403d902ffd10 +commit f904ad102004258dc7b839b93a7904517cc4c623 Author: Matthias Clasen Date: Wed Oct 12 07:15:23 2011 -0400 Adapt to the demise of single includes in GLib - (cherry picked from commit f904ad102004258dc7b839b93a7904517cc4c623) - - Signed-off-by: Emmanuele Bassi json-glib/json-scanner.h | 4 +--- json-glib/tests/gvariant.c | 2 +- json-glib/tests/node.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) -commit e95d570170a89c1175adf06720ba1efad96372bd -Author: Emmanuele Bassi -Date: Mon Oct 17 11:00:52 2011 +0100 +commit d23aa2f10c6580f503dfc6969f8550db9576367f +Author: Chun-wei Fan +Date: Tue Sep 27 15:22:00 2011 +0800 - Conditionally use g_list_free_full() - - JSON-GLib depends on GLib ≥ 2.26, and g_list_free_full() was introduced - in GLib 2.28, so we have to check against the GLib version if we want to - use it. + Update VS9 property sheet - https://bugzilla.gnome.org/show_bug.cgi?id=661244 + Separate intermediate folders so that errors/warnings caused by in-use files + during compilation can be avoided. - json-glib/json-path.c | 19 ++++++++++++++++++- - 1 files changed, 18 insertions(+), 1 deletions(-) + build/win32/vs9/json-glib.vsprops | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit d498c15566cba0123d35d271b727542309ba7d83 -Author: Chun-wei Fan -Date: Tue Sep 27 15:21:06 2011 +0800 +commit 941aff3788ed5ab32e577bcad626150f5e20ce7e +Author: Colin Walters +Date: Thu Sep 22 13:51:09 2011 -0400 - Update VS9 property sheet + build: Fix srcdir != builddir - Seperate intermediate folders to avoid errors/warnings due to files in use - during compilation. + We need to find the generated version.h in the builddir. - build/win32/vs9/json-glib.vsprops | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + json-glib/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit 3543fd3220d5ab567be5d924ef94ee69ae93d5e7 +commit c6fed3b02fb10f4fc76b594f15c56eab6ce7c591 Author: Emmanuele Bassi -Date: Mon Sep 19 14:41:39 2011 +0100 +Date: Mon Sep 19 14:40:54 2011 +0100 - Post-release version bump to 0.14.1 + Post-branch version bump to 0.15.1 configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 35279b587f0b884fd606be77fd06e4fef919a300 Author: Emmanuele Bassi @@ -92,7 +518,7 @@ Date: Mon Sep 19 14:37:45 2011 +0100 Release JSON-GLib 0.14.0 - configure.ac | 4 +- + configure.ac | 4 ++-- po/pl.po | 74 +++++++++++++++++++++++++++++----------------------------- 2 files changed, 39 insertions(+), 39 deletions(-) @@ -103,7 +529,7 @@ Date: Fri Sep 9 16:27:37 2011 +0200 Added Polish translation po/pl.po | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 172 insertions(+), 0 deletions(-) + 1 file changed, 172 insertions(+) commit 67a460d9ea8b485e740d1df34943b8df974f4255 Author: Emmanuele Bassi @@ -112,7 +538,7 @@ Date: Fri Sep 9 15:00:41 2011 +0100 Post-release version bump to 0.13.91 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 1cb4ed1fac84026a19b35ce10c54df8a6ed12959 Author: Emmanuele Bassi @@ -122,7 +548,7 @@ Date: Fri Sep 9 14:57:13 2011 +0100 NEWS | 2 ++ configure.ac | 2 +- - 2 files changed, 3 insertions(+), 1 deletions(-) + 2 files changed, 3 insertions(+), 1 deletion(-) commit 18a83ddad87c92ae78010c678a516087ba012859 Author: Emmanuele Bassi @@ -131,7 +557,7 @@ Date: Fri Sep 9 14:58:17 2011 +0100 build: Fix the path to the 'missing' script Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 9f75475871cc8723e0a41d6c8971f741a405cb9f Author: Emmanuele Bassi @@ -145,8 +571,8 @@ Date: Fri Sep 9 14:00:36 2011 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=658632 - json-glib/json-reader.c | 177 ++++++++++++++++++++++++++++++++++++++++------ - json-glib/json-reader.h | 10 +++- + json-glib/json-reader.c | 177 +++++++++++++++++++++++++++++++++++++++++------ + json-glib/json-reader.h | 10 ++- 2 files changed, 163 insertions(+), 24 deletions(-) commit e7f2d505de39a9dbdea1a5879c13408c7a394a18 @@ -160,7 +586,7 @@ Date: Wed Aug 31 13:33:41 2011 +0800 build/win32/vs10/README.txt | 5 +++++ build/win32/vs9/README.txt | 5 +++++ - 2 files changed, 10 insertions(+), 0 deletions(-) + 2 files changed, 10 insertions(+) commit c2f5b8bc64f9ac06b2dda8662924d88cc759718e Author: Emmanuele Bassi @@ -195,7 +621,7 @@ Date: Sun Jul 31 02:38:08 2011 -0400 round gint64 numbers as valid values for float/double properties. json-glib/json-gobject.c | 22 +++++++++++++++++++++- - 1 files changed, 21 insertions(+), 1 deletions(-) + 1 file changed, 21 insertions(+), 1 deletion(-) commit 996d89911d71f54f9a476242f1bd43c077d4428c Author: Tristan Van Berkom @@ -208,7 +634,7 @@ Date: Wed Jul 13 15:27:07 2011 -0400 we fail to deserialize construct-only properties. json-glib/json-gobject.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) + 1 file changed, 6 insertions(+), 1 deletion(-) commit 4315308a19e4cf474451cecf8b69aceddda91f49 Author: Tristan Van Berkom @@ -238,7 +664,7 @@ Date: Thu Jul 7 16:35:21 2011 -0400 Failed to deserialize property "foo" of type "int" on object "bar" json-glib/json-gobject.c | 42 ++++++++++++++++++++++++++++++------------ - 1 files changed, 30 insertions(+), 12 deletions(-) + 1 file changed, 30 insertions(+), 12 deletions(-) commit 24fa4503ad5d85bf60027bd77c434b2a596b1c17 Author: Laurent Bigonville @@ -248,8 +674,8 @@ Date: Wed Jul 6 12:34:56 2011 +0200 Fix casting issue in Gvariant creation on some architectures. - json-glib/json-gvariant.c | 46 +++++++++++++++++++++++++++++++++++++++----- - 1 files changed, 40 insertions(+), 6 deletions(-) + json-glib/json-gvariant.c | 46 +++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 40 insertions(+), 6 deletions(-) commit dd3c30c5821f9f6bac4cc9016c49c7e6250377eb Author: Emmanuele Bassi @@ -260,8 +686,8 @@ Date: Tue Jul 5 15:07:20 2011 +0100 Use a structure to keep the testable expressions and their results together. - json-glib/tests/path.c | 74 ++++++++++++++++++++++++++++++----------------- - 1 files changed, 47 insertions(+), 27 deletions(-) + json-glib/tests/path.c | 74 ++++++++++++++++++++++++++++++------------------ + 1 file changed, 47 insertions(+), 27 deletions(-) commit acb33a7e6bd3d05d36e7278fafdcb4c35ec88388 Author: Emmanuele Bassi @@ -270,7 +696,7 @@ Date: Tue Jul 5 14:23:13 2011 +0100 build: Replace AC_HELP_STRING with AS_HELP_STRING configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit c296ca9ed06b8e4b54a4bd8003593b3a98b94f6b Author: Emmanuele Bassi @@ -281,7 +707,7 @@ Date: Tue Jul 5 14:22:13 2011 +0100 To compensate for AC_HELP_STRING()'s braindamage. configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 1fb457af51a5632956fd679deca0021becb5468b Author: Emmanuele Bassi @@ -290,7 +716,7 @@ Date: Tue Jul 5 14:22:01 2011 +0100 build: Clean up configure.ac's preamble configure.ac | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) + 1 file changed, 5 insertions(+), 2 deletions(-) commit 75e370e53cb5d31d4a366fc5f126583872f1349a Author: Chun-wei Fan @@ -305,7 +731,7 @@ Date: Wed Jun 29 14:29:12 2011 +0800 build/win32/vs10/README.txt | 87 ++++++++++++++++++++++++++++++++++++++++++ build/win32/vs9/Makefile.am | 1 + build/win32/vs9/README.txt | 86 +++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 175 insertions(+), 0 deletions(-) + 4 files changed, 175 insertions(+) commit 7da6eb52937588537754be7e0b496f51077165d2 Author: Chun-wei Fan @@ -320,7 +746,7 @@ Date: Wed Jun 29 12:54:52 2011 +0800 correctly :| build/win32/vs10/json-glib.sln | 332 ++++++++++++++++++++-------------------- - 1 files changed, 166 insertions(+), 166 deletions(-) + 1 file changed, 166 insertions(+), 166 deletions(-) commit 4ef07b2c6e7d4d444f8ec6ce93c27f7189b942a0 Author: Travis Reitter @@ -333,7 +759,7 @@ Date: Thu Jun 23 16:54:38 2011 -0700 Closes: bgo#653295 - json-glib tests need to link against libgobject-2 json-glib/tests/Makefile.am | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) + 1 file changed, 4 insertions(+), 1 deletion(-) commit c9ac9ce2d417210ccb06d0445a809ce9cd57c7a5 Author: Chun-wei Fan @@ -344,7 +770,7 @@ Date: Mon Jun 20 11:59:57 2011 +0800 Make up for missed backslash build/win32/vs10/json-glib.props | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 230801c694169e50ca45df7df431adbdb89cab18 Author: Chun-wei Fan @@ -435,7 +861,7 @@ Date: Mon Jun 20 00:04:30 2011 +0800 stuff accordingly. -Clean up projects a little bit. - build/win32/vs10/Makefile.am | 36 +++--- + build/win32/vs10/Makefile.am | 36 ++--- build/win32/vs10/array-test.vcxproj | 172 ---------------------- build/win32/vs10/array-test.vcxproj.filters | 14 -- build/win32/vs10/array.vcxproj | 171 ++++++++++++++++++++++ @@ -455,7 +881,7 @@ Date: Mon Jun 20 00:04:30 2011 +0800 build/win32/vs10/gvariant.vcxproj.filters | 14 ++ build/win32/vs10/install.vcxproj | 1 - build/win32/vs10/json-glib.props | 1 - - build/win32/vs10/json-glib.sln | 18 ++-- + build/win32/vs10/json-glib.sln | 18 +-- build/win32/vs10/json-glib.vcxprojin | 1 - build/win32/vs10/node-test.vcxproj | 172 ---------------------- build/win32/vs10/node-test.vcxproj.filters | 14 -- @@ -488,7 +914,7 @@ Date: Sun Jun 19 12:18:04 2011 +0100 build/vs9: Update after the changes in json-glib/tests - build/win32/vs9/Makefile.am | 24 +++--- + build/win32/vs9/Makefile.am | 24 ++--- build/win32/vs9/array-test.vcproj | 157 ------------------------------- build/win32/vs9/array.vcproj | 157 +++++++++++++++++++++++++++++++ build/win32/vs9/boxed.vcproj | 2 +- @@ -547,7 +973,7 @@ Date: Sun Jun 19 12:00:01 2011 +0100 docs: Add index for symbols added in the 0.13 cycle doc/reference/json-glib-docs.xml | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + 1 file changed, 5 insertions(+) commit cc2543e101ca8fa41989bc8eb296f8d11b5b9cad Author: Emmanuele Bassi @@ -564,7 +990,7 @@ Date: Wed Jun 15 11:30:28 2011 +0100 on a separate line. configure.ac | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) + 1 file changed, 1 insertion(+), 2 deletions(-) commit c106aa5b0fc0ca408328b95ba721eef6a9d560d2 Author: Emmanuele Bassi @@ -573,7 +999,7 @@ Date: Wed Jun 15 11:12:38 2011 +0100 Post-release version bump to 0.13.5 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 02b3ee77a35624a3d6e478ae3700100cb24bf18f Author: Emmanuele Bassi @@ -583,7 +1009,7 @@ Date: Wed Jun 15 11:08:37 2011 +0100 NEWS | 6 ++++++ configure.ac | 2 +- - 2 files changed, 7 insertions(+), 1 deletions(-) + 2 files changed, 7 insertions(+), 1 deletion(-) commit f37878ec1759283f78a6d580c1f78e9039717862 Author: Emmanuele Bassi @@ -593,7 +1019,7 @@ Date: Wed Jun 15 11:08:12 2011 +0100 doc/reference/json-glib-sections.txt | 4 ++++ json-glib/json-gobject.h | 6 ++++++ - 2 files changed, 10 insertions(+), 0 deletions(-) + 2 files changed, 10 insertions(+) commit c994a9bfdc13aba1b7c5fd019853c68fb38148a6 Author: Emmanuele Bassi @@ -636,7 +1062,7 @@ Date: Fri Jun 3 11:18:27 2011 +0100 build: Remove deprecation disabling for GLib json-glib/Makefile.am | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + 1 file changed, 1 deletion(-) commit 65a95198a4a1bca7b418af1639c4bb24b09947c5 Author: Chun-wei Fan @@ -666,7 +1092,7 @@ Date: Fri Jun 3 15:01:16 2011 +0800 machinery (commit 67edce08670ce1da4956f87948985434ac5ae2ca) build/win32/config.h.win32.in | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 file changed, 3 insertions(+) commit d93260c477930140f2ecf2927bd9f2a2d7f4f905 Author: Chun-wei Fan @@ -678,7 +1104,7 @@ Date: Fri Jun 3 14:47:42 2011 +0800 build/win32/vs10/json-glib.props | 2 ++ build/win32/vs9/json-glib.vsprops | 1 + - 2 files changed, 3 insertions(+), 0 deletions(-) + 2 files changed, 3 insertions(+) commit c3b367ca8bac245712f8390acab1b38a314972a9 Author: Emmanuele Bassi @@ -687,7 +1113,7 @@ Date: Wed Jun 1 17:10:17 2011 +0100 serializable: Fix introspection annotations json-glib/json-serializable.c | 25 +++++++++++++++++++++++++ - 1 files changed, 25 insertions(+), 0 deletions(-) + 1 file changed, 25 insertions(+) commit aee5a7fbb70e5cb714bcfef79a96c000f62e80db Author: Emmanuele Bassi @@ -715,7 +1141,7 @@ Date: Wed Jun 1 13:35:16 2011 +0100 Update the ignore file for the po directory po/.gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit 8863766ca4792383dad0e48550f8fb79d4c104e4 Author: Emmanuele Bassi @@ -765,7 +1191,7 @@ Date: Wed Jun 1 12:49:28 2011 +0100 serialization, to keep the number of JSON object members down. json-glib/json-gobject.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + 1 file changed, 7 insertions(+) commit 8c424cc133575282371bff8d17295662267049e9 Author: Emmanuele Bassi @@ -777,7 +1203,7 @@ Date: Wed Jun 1 12:48:20 2011 +0100 values than the default ones from the GParamSpec. json-glib/tests/serialize-complex.c | 22 +++++++++++----------- - 1 files changed, 11 insertions(+), 11 deletions(-) + 1 file changed, 11 insertions(+), 11 deletions(-) commit 96b1e6b50f355c04e794ad7366bd33b9c3d1f81b Author: Emmanuele Bassi @@ -803,8 +1229,8 @@ Date: Wed Jun 1 12:36:08 2011 +0100 The validation broke the test suite; it'll need some more work. - json-glib/json-path.c | 77 +++++++++++++----------------------------------- - 1 files changed, 21 insertions(+), 56 deletions(-) + json-glib/json-path.c | 77 ++++++++++++++----------------------------------- + 1 file changed, 21 insertions(+), 56 deletions(-) commit e8fa85705e48d03742eb351addbad53be4d8e60b Author: Emmanuele Bassi @@ -814,8 +1240,8 @@ Date: Wed Jun 1 07:55:17 2011 +0100 Especially for the slice syntax. - json-glib/json-path.c | 77 +++++++++++++++++++++++++++++++++++------------- - 1 files changed, 56 insertions(+), 21 deletions(-) + json-glib/json-path.c | 77 +++++++++++++++++++++++++++++++++++-------------- + 1 file changed, 56 insertions(+), 21 deletions(-) commit 295c469329d040b4d311e9c295bec908856190d6 Author: Emmanuele Bassi @@ -824,7 +1250,7 @@ Date: Wed Jun 1 07:54:48 2011 +0100 symbols: Add JsonPath public entry points json-glib/json-glib.symbols | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + 1 file changed, 6 insertions(+) commit 257209ab47ebcbf36006dd3aa3fcee5545381c6f Author: Emmanuele Bassi @@ -898,7 +1324,7 @@ Date: Sat May 28 14:36:43 2011 +0100 json-glib/json-path.c | 856 +++++++++++++++++++++++++++++++++++++++++++ json-glib/json-path.h | 97 +++++ json-glib/tests/Makefile.am | 1 + - json-glib/tests/path-test.c | 143 +++++++ + json-glib/tests/path-test.c | 143 ++++++++ 8 files changed, 1104 insertions(+), 2 deletions(-) commit b5bd47727c960990ba98902ee2d7099491a4178a @@ -913,14 +1339,14 @@ Date: Mon May 30 14:26:54 2011 +0800 build/win32/vs10/Makefile.am | 2 + build/win32/vs10/gvariant-test.vcxproj | 159 ++++++++++++++++++++++++ - build/win32/vs10/gvariant-test.vcxproj.filters | 14 ++ + build/win32/vs10/gvariant-test.vcxproj.filters | 14 +++ build/win32/vs10/json-glib.props | 2 + build/win32/vs10/json-glib.sln | 10 ++ build/win32/vs9/Makefile.am | 1 + build/win32/vs9/gvariant-test.vcproj | 147 ++++++++++++++++++++++ - build/win32/vs9/json-glib.sln | 14 ++ + build/win32/vs9/json-glib.sln | 14 +++ build/win32/vs9/json-glib.vsprops | 1 + - 9 files changed, 350 insertions(+), 0 deletions(-) + 9 files changed, 350 insertions(+) commit 3a1d817fd39b4b4d2bdbc93257be535c5b29780f Author: Chun-wei Fan @@ -931,7 +1357,7 @@ Date: Mon May 30 13:07:53 2011 +0800 Added the JSON-GLib gvariant-related APIs. json-glib/json-glib.symbols | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + 1 file changed, 4 insertions(+) commit 1b7f20fe88a6647e61964db063eba071114a6f66 Author: Chun-wei Fan @@ -946,7 +1372,7 @@ Date: Mon May 30 12:53:47 2011 +0800 This has been checked with "make distcheck" on Fedora 15 Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 54172e25e8b62075f0aef98d21e17619466ff30f Author: Chun-wei Fan @@ -1008,8 +1434,8 @@ Date: Sat May 28 11:38:18 2011 +0100 Clean up some odd code, and add a unit for the empty object case outlined in bug 651271. - json-glib/tests/builder-test.c | 52 +++++++++++++++++++++++++++++++++++---- - 1 files changed, 46 insertions(+), 6 deletions(-) + json-glib/tests/builder-test.c | 52 +++++++++++++++++++++++++++++++++++----- + 1 file changed, 46 insertions(+), 6 deletions(-) commit d784cc6825607c517d7565049108d1f908a1d71b Author: Emmanuele Bassi @@ -1023,7 +1449,7 @@ Date: Sat May 28 11:36:55 2011 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=651271 json-glib/json-builder.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit e20a8b0faeb45d1ae2f1bd12d49d31d12e357b24 Author: Alexandre Mazari @@ -1037,7 +1463,7 @@ Date: Tue Mar 22 17:28:55 2011 +0100 Signed-off-by: Emmanuele Bassi json-glib/json-gvariant.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 4e41d26586991d2977c846fa4871b6df39fe4106 Author: Emmanuele Bassi @@ -1054,12 +1480,12 @@ Date: Sat May 28 11:05:57 2011 +0100 json-glib/tests/boxed.c | 264 +++++++++++++++++++++++ json-glib/tests/serialize-complex.c | 293 +++++++++++++++++++++++++ json-glib/tests/serialize-full.c | 402 +++++++++++++++++++++++++++++++++++ - json-glib/tests/serialize-simple.c | 166 ++++++++++++++ + json-glib/tests/serialize-simple.c | 166 +++++++++++++++ tests/Makefile.am | 34 --- tests/test-serialize-boxed.c | 264 ----------------------- tests/test-serialize-complex.c | 293 ------------------------- tests/test-serialize-full.c | 402 ----------------------------------- - tests/test-serialize-simple.c | 166 -------------- + tests/test-serialize-simple.c | 166 --------------- 12 files changed, 1142 insertions(+), 1203 deletions(-) commit 8d98b99b945423085232d358492e97399c9fd071 @@ -1082,7 +1508,7 @@ Date: Thu May 19 08:32:03 2011 +0100 Add ignore file under build/win32 build/win32/.gitignore | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + 1 file changed, 4 insertions(+) commit f4651885961bf3ccc8d475cdc86af051fe1101f6 Author: Emmanuele Bassi @@ -1091,7 +1517,7 @@ Date: Wed May 18 13:44:07 2011 +0100 doap: Add the download-page resource json-glib.doap | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit 8ef7da62a7575ebb04c69b9d98fd24efb840ab3b Author: Emmanuele Bassi @@ -1100,7 +1526,7 @@ Date: Wed May 18 13:39:38 2011 +0100 Post-release version bump to 0.13.3 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit aa793a4fbcc4d44d367ba84d3782823885fec045 Author: Emmanuele Bassi @@ -1110,7 +1536,7 @@ Date: Wed May 18 13:37:38 2011 +0100 NEWS | 12 ++++++++++++ configure.ac | 2 +- - 2 files changed, 13 insertions(+), 1 deletions(-) + 2 files changed, 13 insertions(+), 1 deletion(-) commit 595bdd9cc160f10edefb9e54f45cb4727f39ac24 Merge: 46a8e57 d3db7ac @@ -1128,7 +1554,7 @@ Date: Tue May 3 00:20:12 2011 +0900 This fixes deserialization to match serialization (bug 648539) json-glib/json-gobject.c | 14 +++++++++++++- - 1 files changed, 13 insertions(+), 1 deletions(-) + 1 file changed, 13 insertions(+), 1 deletion(-) commit 9824a32a803bd194208d460068ce5ba91d776686 Author: Tristan Van Berkom @@ -1137,7 +1563,7 @@ Date: Sat Apr 23 18:15:37 2011 +0900 Warn from json_gobject_deserialize() if a listed property cannot be deserialized. json-glib/json-gobject.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 file changed, 3 insertions(+) commit 254e8e969968e7ed5f594238a980b20c6fabc46e Author: Bastien Nocera @@ -1146,7 +1572,7 @@ Date: Thu Apr 21 02:29:53 2011 +0100 reader: Fix bug in example usage json-glib/json-reader.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 46a8e576f2fae9563219fcd72a9866826e684559 Author: Chun-wei Fan @@ -1186,7 +1612,7 @@ Date: Wed Apr 13 00:34:05 2011 +0800 .../win32/vs10/test-serialize-full.vcxproj.filters | 14 ++ build/win32/vs10/test-serialize-simple.vcxproj | 171 +++++++++++++++++ .../vs10/test-serialize-simple.vcxproj.filters | 14 ++ - 27 files changed, 2678 insertions(+), 0 deletions(-) + 27 files changed, 2678 insertions(+) commit 6c74292e66be25840612d7ee6871f1668010eada Author: Chun-wei Fan @@ -1238,11 +1664,11 @@ Date: Wed Apr 13 00:02:48 2011 +0800 These are the updated VS 2008 Project files and property sheets themselves. x64 compiling support is also added - build/win32/vs9/array-test.vcproj | 132 ++++------- + build/win32/vs9/array-test.vcproj | 132 ++++------ build/win32/vs9/builder-test.vcproj | 134 ++++------- build/win32/vs9/generator-test.vcproj | 134 ++++------- - build/win32/vs9/install.vcproj | 44 +++-- - build/win32/vs9/json-glib.sln | 115 +++++++++- + build/win32/vs9/install.vcproj | 44 ++-- + build/win32/vs9/json-glib.sln | 115 ++++++++- build/win32/vs9/json-glib.vcproj | 317 ------------------------- build/win32/vs9/json-glib.vcprojin | 204 ++++++++++++++++ build/win32/vs9/json-glib.vsprops | 20 +- @@ -1265,7 +1691,7 @@ Date: Tue Apr 12 08:53:26 2011 +0100 JSON-GLib uses the GNOME Bugzilla instance. json-glib.doap | 19 +------------------ - 1 files changed, 1 insertions(+), 18 deletions(-) + 1 file changed, 1 insertion(+), 18 deletions(-) commit 0ff8f784848ad34c37bd60ad92791c6f76944803 Author: Emmanuele Bassi @@ -1276,7 +1702,7 @@ Date: Tue Apr 12 08:41:20 2011 +0100 Building against JSON-GLib requires GIO. json-glib.pc.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 8b060cd9144990aae6531982bad66050fafcb658 Author: Emmanuele Bassi @@ -1287,7 +1713,7 @@ Date: Fri Apr 8 15:17:19 2011 +0100 Instead of manual iteration, let's use the function GList provides us. json-glib/json-object.c | 13 +++---------- - 1 files changed, 3 insertions(+), 10 deletions(-) + 1 file changed, 3 insertions(+), 10 deletions(-) commit 2158cecee6fe1da8786afe2fad94d1098f879786 Author: Emmanuele Bassi @@ -1300,7 +1726,7 @@ Date: Wed Mar 23 11:35:28 2011 +0000 facilities from autoconf. configure.ac | 20 +++++++++++--------- - 1 files changed, 11 insertions(+), 9 deletions(-) + 1 file changed, 11 insertions(+), 9 deletions(-) commit 992d966572e3e498031578558ac307d0f4909246 Author: Rob Taylor @@ -1315,7 +1741,7 @@ Date: Tue Mar 15 09:09:11 2011 +0000 Signed-off-by: Emmanuele Bassi json-glib/json-gvariant.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit af70f34b3fc46a4c464418ebd6a16d9a1f18af8a Author: Eduardo Lima Mitev @@ -1326,8 +1752,8 @@ Date: Thu Jan 27 16:58:48 2011 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=640729 json-glib/json-generator.c | 35 +++++++++++------ - json-glib/tests/builder-test.c | 6 +- - json-glib/tests/generator-test.c | 34 ++++++++-------- + json-glib/tests/builder-test.c | 6 +-- + json-glib/tests/generator-test.c | 34 ++++++++--------- json-glib/tests/gvariant-test.c | 78 +++++++++++++++++++------------------- 4 files changed, 82 insertions(+), 71 deletions(-) @@ -1351,7 +1777,7 @@ Date: Tue Feb 15 16:16:46 2011 +0000 random values. json-glib/tests/object-test.c | 29 +++++++++++++++++++++++++++++ - 1 files changed, 29 insertions(+), 0 deletions(-) + 1 file changed, 29 insertions(+) commit 1a633159a593c962233a5ef4660e31e60eed96d9 Author: Emmanuele Bassi @@ -1372,7 +1798,7 @@ Date: Tue Feb 15 16:12:38 2011 +0000 https://bugzilla.gnome.org/show_bug.cgi?id=642383 json-glib/json-object.c | 21 +++++++++++++++++++++ - 1 files changed, 21 insertions(+), 0 deletions(-) + 1 file changed, 21 insertions(+) commit a125a724894a08a8d8053fdd2db92d0ad8e2dfd4 Author: Emmanuele Bassi @@ -1385,7 +1811,7 @@ Date: Sun Feb 6 23:10:54 2011 +0000 one. json-glib/json-reader.c | 15 ++++++--------- - 1 files changed, 6 insertions(+), 9 deletions(-) + 1 file changed, 6 insertions(+), 9 deletions(-) commit 2c5f4563c54fa273ffd8dbe02b60a12c4b54b977 Author: Emmanuele Bassi @@ -1400,7 +1826,7 @@ Date: Sun Feb 6 12:22:49 2011 +0000 json-glib/json-reader.c | 32 ++++++++++++++++++++++++++++++++ json-glib/json-reader.h | 1 + json-glib/tests/reader-test.c | 1 + - 5 files changed, 36 insertions(+), 0 deletions(-) + 5 files changed, 36 insertions(+) commit b2880f5a4dad07ff96a9b6578ffc5d677f75eb94 Author: Emmanuele Bassi @@ -1439,7 +1865,7 @@ Date: Fri Feb 4 19:18:22 2011 +0000 json-glib/json-reader.c | 46 ++++++++++++++++++++++++++++++++++ json-glib/json-reader.h | 1 + json-glib/tests/reader-test.c | 19 ++++++++++++++ - 5 files changed, 68 insertions(+), 0 deletions(-) + 5 files changed, 68 insertions(+) commit eb14f92019bde75947a98f5578167af6b6a17974 Author: Emmanuele Bassi @@ -1455,7 +1881,7 @@ Date: Wed Jan 26 16:58:56 2011 +0000 so we should adhere to it. json-glib/json-gvariant.c | 67 ++++++++++++++++++++++++--------------------- - 1 files changed, 36 insertions(+), 31 deletions(-) + 1 file changed, 36 insertions(+), 31 deletions(-) commit 212b243c07721242da3dc2c0e6dfe979f73ee5c6 Author: Eduardo Lima Mitev @@ -1473,7 +1899,7 @@ Date: Tue Nov 9 16:45:30 2010 +0100 json-glib/json-gvariant.h | 46 ++ json-glib/tests/Makefile.am | 4 + json-glib/tests/gvariant-test.c | 233 ++++++ - 8 files changed, 1594 insertions(+), 0 deletions(-) + 8 files changed, 1594 insertions(+) commit 822b6be848f3ad53ad113f0ce317b01f1a91a54f Author: Emmanuele Bassi @@ -1486,7 +1912,7 @@ Date: Sat Jan 15 18:36:34 2011 +0000 anyway. configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 7c07a6549df1ae1b4826bf40f70c62768ce7e35b Author: Emmanuele Bassi @@ -1495,7 +1921,7 @@ Date: Mon Jan 10 11:56:32 2011 +0000 build: Fix previous commit configure.ac | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + 1 file changed, 7 insertions(+) commit bb67e146c9e883185d264e693cc4a07d1a60d191 Author: Fan, Chun-wei @@ -1521,7 +1947,7 @@ Date: Mon Jan 10 11:49:16 2011 +0000 build/win32/vs9/install.vcproj | 71 ++++++ build/win32/vs9/json-glib.sln | 80 +++++++ build/win32/vs9/json-glib.vcproj | 317 +++++++++++++++++++++++++ - build/win32/vs9/json-glib.vsprops | 93 +++++++ + build/win32/vs9/json-glib.vsprops | 93 ++++++++ build/win32/vs9/node-test.vcproj | 189 +++++++++++++++ build/win32/vs9/object-test.vcproj | 187 +++++++++++++++ build/win32/vs9/parser-test.vcproj | 189 +++++++++++++++ @@ -1530,7 +1956,7 @@ Date: Mon Jan 10 11:49:16 2011 +0000 build/win32/vs9/test-serialize-complex.vcproj | 188 +++++++++++++++ build/win32/vs9/test-serialize-full.vcproj | 189 +++++++++++++++ build/win32/vs9/test-serialize-simple.vcproj | 189 +++++++++++++++ - 20 files changed, 2822 insertions(+), 1 deletions(-) + 20 files changed, 2822 insertions(+), 1 deletion(-) commit c7cd46b8320157e223009aa2a7204461c7d301d5 Author: Emmanuele Bassi @@ -1540,7 +1966,7 @@ Date: Mon Jan 10 11:48:26 2011 +0000 json-glib/Makefile.am | 2 + json-glib/json-glib.symbols | 163 +++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 165 insertions(+), 0 deletions(-) + 2 files changed, 165 insertions(+) commit 4549af3210461a07dc84a30433a0a23764618e4c Author: Evan Nemerson @@ -1551,7 +1977,7 @@ Date: Sat Nov 20 16:25:41 2010 -0800 Bug #635398 json-glib/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit f89a50e24d2088061eb7d975db7e6f39beaf853d Author: Emmanuele Bassi @@ -1562,7 +1988,7 @@ Date: Mon Jan 10 11:16:17 2011 +0000 Check if we're setting the same node, to avoid a needless replace. json-glib/json-object.c | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) + 1 file changed, 10 insertions(+) commit e828cba563f2584e848994935478a7ffd21728df Author: Luca Bruno @@ -1591,7 +2017,7 @@ Date: Mon Jan 10 10:45:39 2011 +0000 https://bugzilla.gnome.org/show_bug.cgi?id=637244 json-glib/json-generator.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) + 1 file changed, 4 insertions(+), 3 deletions(-) commit 3dbab961e675d0684df1121906ae3588d09653e6 Author: Emmanuele Bassi @@ -1603,7 +2029,7 @@ Date: Mon Jan 10 10:43:58 2011 +0000 especially when dealing with IEEE machine-neutral values. json-glib/tests/builder-test.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 567d7fb4dff83c9e37e64ef8611f0231fa181c34 Author: Emmanuele Bassi @@ -1614,7 +2040,7 @@ Date: Tue Dec 14 16:35:24 2010 +0000 Use modern API to deal with properties installation and notification. json-glib/json-reader.c | 35 +++++++++++++++-------------------- - 1 files changed, 15 insertions(+), 20 deletions(-) + 1 file changed, 15 insertions(+), 20 deletions(-) commit 9aed6f5a455109186ae56ec1c3e558505644d57f Author: Emmanuele Bassi @@ -1628,10 +2054,10 @@ Date: Tue Dec 14 16:26:10 2010 +0000 While we're at it, we should also use modern API for installing and notifying of property changes. - doc/reference/json-glib-sections.txt | 11 ++- + doc/reference/json-glib-sections.txt | 11 +- json-glib/json-generator.c | 256 ++++++++++++++++++++++++++++------ - json-glib/json-generator.h | 35 +++-- - 3 files changed, 246 insertions(+), 56 deletions(-) + json-glib/json-generator.h | 37 +++-- + 3 files changed, 247 insertions(+), 57 deletions(-) commit de991a0c6dc4d0b3c366248e20ba6853bd2c3e92 Author: Emmanuele Bassi @@ -1644,7 +2070,7 @@ Date: Tue Dec 14 11:39:04 2010 +0000 comprehensive test suite. json-glib/tests/generator-test.c | 58 ++++++++++++++++++++++++++++++++++++++ - 1 files changed, 58 insertions(+), 0 deletions(-) + 1 file changed, 58 insertions(+) commit 4add0e081b8f58dec1cd68152d846be87942091e Author: Emmanuele Bassi @@ -1656,7 +2082,7 @@ Date: Tue Dec 14 11:37:25 2010 +0000 that completely went under the radar for all this time. json-glib/json-generator.c | 15 ++++++++++----- - 1 files changed, 10 insertions(+), 5 deletions(-) + 1 file changed, 10 insertions(+), 5 deletions(-) commit 20a16d5b9ecabe68ee18655b2ff3bdb17136c6f1 Author: Emmanuele Bassi @@ -1668,7 +2094,7 @@ Date: Tue Oct 19 09:59:38 2010 +0100 three times. build/autotools/Makefile.am.gtest | 21 ++++++++++++--------- - 1 files changed, 12 insertions(+), 9 deletions(-) + 1 file changed, 12 insertions(+), 9 deletions(-) commit dc262a09572328342164ebb23ad698b5cb3cd8ff Author: Emmanuele Bassi @@ -1677,7 +2103,7 @@ Date: Tue Oct 19 09:49:20 2010 +0100 Use G_DEFINE_INTERFACE() json-glib/json-serializable.c | 35 +++++++---------------------------- - 1 files changed, 7 insertions(+), 28 deletions(-) + 1 file changed, 7 insertions(+), 28 deletions(-) commit 80665415cd945f3dafed6925c9975f36b916a80f Author: Emmanuele Bassi @@ -1707,7 +2133,7 @@ Date: Wed Sep 29 17:25:18 2010 +0100 build: Use -no-undefined when compiling on win32 configure.ac | 13 +++++++++++++ - 1 files changed, 13 insertions(+), 0 deletions(-) + 1 file changed, 13 insertions(+) commit 5332217481b3e5fee73710bb50886fbc52a632a4 Author: Emmanuele Bassi @@ -1716,7 +2142,7 @@ Date: Sat Sep 25 12:02:36 2010 +0100 Post-branch version bump to 0.13.1 configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 6b4d49b8024f672d62a7059c083455ad31f7d0eb Author: Emmanuele Bassi @@ -1725,7 +2151,7 @@ Date: Sat Sep 25 11:59:23 2010 +0100 Post-release version bump to 0.12.1 configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 661a7497cc88aebdee32bf31c219d457ca143590 Author: Emmanuele Bassi @@ -1751,7 +2177,7 @@ Date: Sat Sep 25 11:50:38 2010 +0100 after that. json-glib/json-gobject.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit d480f2e77e3dc0d00fc617686b306f96353b7177 Author: Emmanuele Bassi @@ -1763,7 +2189,7 @@ Date: Sat Sep 25 11:49:41 2010 +0100 anyway. tests/test-serialize-full.c | 15 +-------------- - 1 files changed, 1 insertions(+), 14 deletions(-) + 1 file changed, 1 insertion(+), 14 deletions(-) commit ff5dd56e4f864d0c015dcd66fa852f9cf7cf90dd Author: Emmanuele Bassi @@ -1818,7 +2244,7 @@ Date: Thu Sep 9 10:24:53 2010 -0400 introspection: Export json-glib-1.0 pkg-config file json-glib/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit d05e919208a47c18d001ac08900b4d2837efd4b4 Author: Luca Bruno @@ -1827,7 +2253,7 @@ Date: Sun Aug 15 20:30:21 2010 +0200 docs: Add transfer none annotation to JsonBuilder return values. json-glib/json-builder.c | 22 +++++++++++----------- - 1 files changed, 11 insertions(+), 11 deletions(-) + 1 file changed, 11 insertions(+), 11 deletions(-) commit 2c3062cbd79826b184a6f613c519e69f3ddc1ec6 Author: Emmanuele Bassi @@ -1835,8 +2261,8 @@ Date: Sun Aug 15 18:46:02 2010 +0100 builder: Add Since: annotations - json-glib/json-builder.h | 50 +++++++++++++++++++++++++-------------------- - 1 files changed, 28 insertions(+), 22 deletions(-) + json-glib/json-builder.h | 54 +++++++++++++++++++++++++--------------------- + 1 file changed, 30 insertions(+), 24 deletions(-) commit 2d7550948dfb2e5907b851bc2c4bd296a7526086 Author: Emmanuele Bassi @@ -1850,7 +2276,7 @@ Date: Sun Aug 15 18:44:13 2010 +0100 JSON definition. json-glib/json-gobject.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit be48afe5801a541996bb64437c278088e70258f6 Author: Emmanuele Bassi @@ -1859,7 +2285,7 @@ Date: Sun Aug 15 18:43:49 2010 +0100 build: Use maintainer-clean for removing ignore files build/autotools/Makefile.am.gitignore | 11 ++++++++--- - 1 files changed, 8 insertions(+), 3 deletions(-) + 1 file changed, 8 insertions(+), 3 deletions(-) commit 5732cadfab58435ded4e88b0733c1a46aa0dcd2d Author: Emmanuele Bassi @@ -1884,7 +2310,7 @@ Date: Sat Aug 14 12:26:29 2010 +0100 docs: Add 0.12 symbols index to the API reference doc/reference/json-glib-docs.xml | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + 1 file changed, 5 insertions(+) commit 9ed8d5e7fe96b9dcf82ddbba7de2db40d415cbaf Author: Emmanuele Bassi @@ -1895,7 +2321,7 @@ Date: Sat Aug 14 12:24:59 2010 +0100 A JsonReader is useless without a root JsonNode to start walking the tree from. - json-glib/json-reader.c | 96 +++++++++++++++++++++++++++++++++++++--- + json-glib/json-reader.c | 96 +++++++++++++++++++++++++++++++++++++---- json-glib/json-reader.h | 2 +- json-glib/tests/reader-test.c | 4 +- 3 files changed, 91 insertions(+), 11 deletions(-) @@ -1907,7 +2333,7 @@ Date: Sat Aug 14 09:40:44 2010 +0100 docs: Add the RFC draft for JSON schema doc/draft-zyp-json-schema-02.txt | 1345 ++++++++++++++++++++++++++++++++++++++ - 1 files changed, 1345 insertions(+), 0 deletions(-) + 1 file changed, 1345 insertions(+) commit 0281176789b38973b1723f752070cb0e7340055d Author: Emmanuele Bassi @@ -1923,7 +2349,7 @@ Date: Thu Aug 12 16:09:45 2010 +0100 doc/reference/json-glib-sections.txt | 2 +- json-glib/json-reader.c | 90 +++++++++++----------------------- json-glib/json-reader.h | 6 +-- - json-glib/tests/reader-test.c | 11 +++- + json-glib/tests/reader-test.c | 11 ++++- 4 files changed, 41 insertions(+), 68 deletions(-) commit 149d2f3925ca798886f2137ae73488f7e2e6386b @@ -1947,7 +2373,7 @@ Date: Thu Aug 12 15:35:17 2010 +0100 docs: Update NEWS NEWS | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit 23866cb9935e9b9f7c88b26cdfc13ff95edfbe00 Author: Emmanuele Bassi @@ -1957,8 +2383,8 @@ Date: Thu Aug 12 15:34:09 2010 +0100 doc/reference/json-glib-docs.xml | 1 + doc/reference/json-glib-sections.txt | 41 ++++++++++++++++++++++++++++++++++ - doc/reference/json-glib.types | 2 + - 3 files changed, 44 insertions(+), 0 deletions(-) + doc/reference/json-glib.types | 2 ++ + 3 files changed, 44 insertions(+) commit 10e5a1d38113b7b6e7c71da76ff11219baf1022d Author: Emmanuele Bassi @@ -1990,7 +2416,7 @@ Date: Wed Aug 11 14:42:25 2010 -0500 Bug #626669 json-glib/tests/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) commit 7f85693922d1e2614bcce9219d2c6521580dd360 Author: Emmanuele Bassi @@ -2013,7 +2439,7 @@ Date: Mon Aug 2 17:49:32 2010 +0100 Post-release version bump to 0.11.3 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit ff7a8ff73ee214d385c64501c8b5dc682ccad1cf Author: Emmanuele Bassi @@ -2022,7 +2448,7 @@ Date: Mon Aug 2 17:40:29 2010 +0100 Release 0.11.2 (0.12.0-rc1) configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 8a91b052fba48ae6f4a61115e2fa6839e7a21509 Author: Emmanuele Bassi @@ -2045,7 +2471,7 @@ Date: Mon Aug 2 17:42:09 2010 +0100 build: Fix introspection dependencies json-glib/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit def6d5612fbb33f9b02df80294651f5a28a83ccc Author: Emmanuele Bassi @@ -2054,7 +2480,7 @@ Date: Mon Aug 2 17:15:36 2010 +0100 Update the NEWS file NEWS | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit 385e6278477dfd35d591f8343deb1de2827ac2ff Author: Emmanuele Bassi @@ -2063,7 +2489,7 @@ Date: Mon Aug 2 17:15:22 2010 +0100 docs: Update the dependencies in the README file README | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 5e19ed2523441afd12c45a8b3f19d10fc9a37335 Author: Emmanuele Bassi @@ -2074,7 +2500,7 @@ Date: Mon Aug 2 17:14:52 2010 +0100 GIO landed in GLib 2.16, so we don't need the version bump to 2.20. configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit d9b2845572123ed79a6626d90d2d2298c9c3d5a7 Author: Emmanuele Bassi @@ -2089,7 +2515,7 @@ Date: Mon Aug 2 17:07:36 2010 +0100 doc/reference/json-glib-sections.txt | 1 + json-glib/json-generator.c | 37 ++++++++++++++++++++++++++++++++++ - json-glib/json-generator.h | 22 ++++++++++++------- + json-glib/json-generator.h | 22 ++++++++++++-------- 3 files changed, 52 insertions(+), 8 deletions(-) commit c7c288b89175b1f9545d6ddff25609b7bb243041 @@ -2099,7 +2525,7 @@ Date: Mon Aug 2 17:04:38 2010 +0100 Fix the include for json-types.h json-glib/json-parser.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit e6ea3a6bae044ec7874dfde3b50bb337f00bb3be Author: Emmanuele Bassi @@ -2110,7 +2536,7 @@ Date: Mon Aug 2 16:41:18 2010 +0100 json-glib/tests/Makefile.am | 2 + json-glib/tests/parser-test.c | 78 ++++++++++++++++++++++++++++++++++++++ json-glib/tests/stream-load.json | 1 + - 3 files changed, 81 insertions(+), 0 deletions(-) + 3 files changed, 81 insertions(+) commit 8cac7f2b6987803e36ff6abe012cd3e017b5b960 Author: Emmanuele Bassi @@ -2119,7 +2545,7 @@ Date: Mon Aug 2 16:40:36 2010 +0100 docs: Add the new JsonParser stream API doc/reference/json-glib-sections.txt | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 file changed, 3 insertions(+) commit 107e53b2daa27b99fb629dd1e2bf9bfd2729b3dd Author: Emmanuele Bassi @@ -2131,8 +2557,8 @@ Date: Mon Aug 2 16:39:04 2010 +0100 asynchronously) to retrieve the JSON data and parse it. json-glib/json-parser.c | 258 +++++++++++++++++++++++++++++++++++++++++++++++ - json-glib/json-parser.h | 43 +++++--- - 2 files changed, 286 insertions(+), 15 deletions(-) + json-glib/json-parser.h | 49 +++++---- + 2 files changed, 289 insertions(+), 18 deletions(-) commit b164bb5180749aaff385f5d61866875bfbf9c552 Author: Emmanuele Bassi @@ -2141,7 +2567,7 @@ Date: Mon Aug 2 16:38:01 2010 +0100 build: Use the GIO prefix for cross-references doc/reference/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) commit 6d317b129169352111ab16a0df9aee8b9aa5284b Author: Emmanuele Bassi @@ -2152,7 +2578,7 @@ Date: Mon Aug 2 16:37:32 2010 +0100 Bump up the dependencies to be able to use GIO. configure.ac | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 file changed, 4 insertions(+), 4 deletions(-) commit 84230dd03b5db34da5ccef0a4926e18c22124952 Author: Emmanuele Bassi @@ -2161,7 +2587,7 @@ Date: Wed Jul 21 23:50:09 2010 +0100 docs: Fix up the cgit URL README | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit 67ad0f21ca554edcd6633014b0bce7dd8d216191 Author: Emmanuele Bassi @@ -2170,7 +2596,7 @@ Date: Wed Jul 21 23:49:56 2010 +0100 Update NEWS for the next stable release NEWS | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) + 1 file changed, 10 insertions(+) commit 465880e5ccaca086fd1b881bd7175658d627318c Author: Colin Walters @@ -2181,7 +2607,7 @@ Date: Tue Jul 6 10:49:27 2010 -0400 Fixes parallel builds. json-glib/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit 66e5f619d55433985460e8c641beb98e85832451 Author: Emmanuele Bassi @@ -2215,7 +2641,7 @@ Date: Wed Jun 9 21:31:06 2010 +0200 json-glib/json-glib.h | 1 + json-glib/tests/Makefile.am | 3 + json-glib/tests/builder-test.c | 121 +++++++ - 7 files changed, 910 insertions(+), 0 deletions(-) + 7 files changed, 910 insertions(+) commit 3f8c8f99126dc1a70d847eded13afd4b64395250 Author: Emmanuele Bassi @@ -2226,9 +2652,9 @@ Date: Wed Jun 16 11:54:55 2010 +0100 We should not warn when asking for a string, array or object if the contents were 'null'. - json-glib/json-array.c | 42 ++++++++++++++++++++++++++++++-------- - json-glib/json-object.c | 45 ++++++++++++++++++++++++++++++++-------- - json-glib/tests/object-test.c | 4 +++ + json-glib/json-array.c | 42 +++++++++++++++++++++++++++++--------- + json-glib/json-object.c | 45 ++++++++++++++++++++++++++++++++--------- + json-glib/tests/object-test.c | 4 ++++ 3 files changed, 73 insertions(+), 18 deletions(-) commit 471bcf28589e0929984c4e6a097ae273b017b3f0 @@ -2250,7 +2676,7 @@ Date: Fri May 28 11:57:18 2010 +0100 Signed-off-by: Emmanuele Bassi json-glib.pc.in | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit 70b9235b50dd4257e0bf196e07f65807d65f8091 Author: Emmanuele Bassi @@ -2261,7 +2687,7 @@ Date: Fri May 28 11:50:01 2010 +0100 JsonNode is fully opaque, so there are no fields to annotate. json-glib/json-types.h | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + 1 file changed, 1 deletion(-) commit aaf08f5c1a08c8aaec2436653114996b98ee1f8c Author: Emmanuele Bassi @@ -2280,15 +2706,15 @@ Date: Fri May 28 11:35:05 2010 +0100 • Use gobject-introspection's Makefile rules, and update introspection.m4 README | 4 +- - build/autotools/Makefile.am | 3 - + build/autotools/Makefile.am | 3 -- build/autotools/Makefile.am.silent | 6 --- build/autotools/introspection.m4 | 6 +++ build/autotools/shave-libtool.in | 69 ------------------------------- build/autotools/shave.in | 79 ------------------------------------ build/autotools/shave.m4 | 77 ----------------------------------- - configure.ac | 44 +++++-------------- - json-glib/Makefile.am | 43 ++++++------------- - 9 files changed, 34 insertions(+), 297 deletions(-) + configure.ac | 46 ++++++--------------- + json-glib/Makefile.am | 47 ++++++++------------- + 9 files changed, 37 insertions(+), 300 deletions(-) commit 6231cf027a8f9c3b11324c1d49a350ba55353123 Author: Emmanuele Bassi @@ -2304,7 +2730,7 @@ Date: Wed May 26 08:43:10 2010 +0100 EPIC. FAIL. json-glib/json-parser.c | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) + 1 file changed, 6 insertions(+), 3 deletions(-) commit fcd07918d3ed2b31b047900da9d2fed23dddf7da Author: Eiichi Sato @@ -2317,7 +2743,7 @@ Date: Sat Apr 10 01:52:10 2010 +0900 Signed-off-by: Emmanuele Bassi json-glib/json-scanner.c | 16 +++++++++++++++- - 1 files changed, 15 insertions(+), 1 deletions(-) + 1 file changed, 15 insertions(+), 1 deletion(-) commit 37a7931f91f8d79def3f4895bc349ba621a826a1 Author: Emmanuele Bassi @@ -2329,7 +2755,7 @@ Date: Wed Apr 14 23:19:58 2010 +0100 be ignored by gtk-doc. doc/reference/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) commit 28edd58ddfd719d107d89aa364dc208b0126c90f Author: Emmanuele Bassi @@ -2340,7 +2766,7 @@ Date: Wed Apr 14 23:19:28 2010 +0100 There is no such thing as a 'JsonArrary' type. json-glib/json-parser.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit d40045bd855bfcb73c10967d894a8e91f8675409 Author: Emmanuele Bassi @@ -2349,7 +2775,7 @@ Date: Wed Apr 14 23:17:28 2010 +0100 docs: Fix typo in JsonParserError annotation json-glib/json-parser.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit b55d139ed0368f368c6c9c8f8adfab4c91f1f508 Author: Emmanuele Bassi @@ -2364,7 +2790,7 @@ Date: Sat Apr 3 14:59:00 2010 +0100 Thanks to: Michael Stapelberg json-glib/json-parser.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 24567790d30e314ee519c8f3756b3514c0c3fd31 Author: Emmanuele Bassi @@ -2403,8 +2829,8 @@ Date: Fri Mar 19 15:40:48 2010 +0000 The code is fairly cleaner, now; and, most of all, still passes the validation test suite - which is, you know... nice. - json-glib/json-parser.c | 480 +++++++++++++++++++---------------------------- - 1 files changed, 196 insertions(+), 284 deletions(-) + json-glib/json-parser.c | 488 +++++++++++++++++++---------------------------- + 1 file changed, 200 insertions(+), 288 deletions(-) commit 9ce82f8052290f3956c3d80c8739c214da314d42 Author: Emmanuele Bassi @@ -2419,9 +2845,9 @@ Date: Fri Mar 19 11:04:00 2010 +0000 This, frankly, is quite stupid. - json-glib/json-parser.c | 49 ++++++++++++++++++++++++++++++++-------- - json-glib/json-parser.h | 8 ++++++ - json-glib/tests/parser-test.c | 18 +++++++------- + json-glib/json-parser.c | 49 ++++++++++++++++++++++++++++++++--------- + json-glib/json-parser.h | 8 +++++++ + json-glib/tests/parser-test.c | 18 +++++++-------- 3 files changed, 56 insertions(+), 19 deletions(-) commit 9d7c58b4fb5edeb8e9413acc9d509447e13962e5 @@ -2444,7 +2870,7 @@ Date: Thu Mar 18 17:11:11 2010 +0000 parser-test: Add a case for double parsing in JsonObject json-glib/tests/parser-test.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) commit 54756457de3f01d1a487fc6b90c5bd9b5b50bcf3 Author: Emmanuele Bassi @@ -2456,8 +2882,8 @@ Date: Thu Mar 18 17:09:38 2010 +0000 bare value parsing that is also provided by json_parse_value(). We should kill it off to avoid redundant code. - json-glib/json-parser.c | 57 +--------------------------------------------- - 1 files changed, 2 insertions(+), 55 deletions(-) + json-glib/json-parser.c | 57 ++--------------------------------------------- + 1 file changed, 2 insertions(+), 55 deletions(-) commit 3355987049560b4d31af22476a7c2b20c9d6665b Author: Emmanuele Bassi @@ -2468,7 +2894,7 @@ Date: Thu Mar 18 17:08:44 2010 +0000 Print out the values we are parsing, for debug purposes. json-glib/json-parser.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) + 1 file changed, 8 insertions(+) commit f622ee8d8ba54ddea6fbb7311a905ffab7842e8d Author: Emmanuele Bassi @@ -2486,7 +2912,7 @@ Date: Thu Mar 18 17:05:57 2010 +0000 Epic reading fail. json-glib/json-generator.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 90d6e0b8c334b3fd7995c126f07dd61ba0a9e0fb Author: Emmanuele Bassi @@ -2498,7 +2924,7 @@ Date: Thu Mar 18 15:26:19 2010 +0000 object with a nested array and nested object definitions. json-glib/tests/parser-test.c | 21 ++++++++++++++++++++- - 1 files changed, 20 insertions(+), 1 deletions(-) + 1 file changed, 20 insertions(+), 1 deletion(-) commit f4c57ac4227c4edb8a4cecb784e871fbd5649ad1 Author: Emmanuele Bassi @@ -2511,7 +2937,7 @@ Date: Thu Mar 18 15:24:39 2010 +0000 or an object member definition. json-glib/json-parser.c | 44 ++++++++++++++++++++++++-------------------- - 1 files changed, 24 insertions(+), 20 deletions(-) + 1 file changed, 24 insertions(+), 20 deletions(-) commit b3435c6a05ecee58c64dce669ce7e44f829afc98 Author: Emmanuele Bassi @@ -2526,7 +2952,7 @@ Date: Thu Mar 18 15:21:29 2010 +0000 json-glib/Makefile.am | 4 +++- json-glib/json-debug.c | 37 +++++++++++++++++++++++++++++++++++++ json-glib/json-debug.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 85 insertions(+), 1 deletions(-) + 3 files changed, 85 insertions(+), 1 deletion(-) commit 88ac0d5111eb528e4c396e4c169ceee4fb046e62 Author: Emmanuele Bassi @@ -2535,7 +2961,7 @@ Date: Fri Mar 5 19:23:49 2010 +0000 tests: Add another trailing comma invalid test json-glib/tests/parser-test.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) commit c22c1151e418af9506547804d4bc9fddb60bc0f1 Author: Emmanuele Bassi @@ -2546,7 +2972,7 @@ Date: Mon Mar 1 17:42:41 2010 +0000 Verify that invalid JSON will trigger a parser error. json-glib/tests/parser-test.c | 53 +++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 53 insertions(+), 0 deletions(-) + 1 file changed, 53 insertions(+) commit 26668fe238a52a7fd8374f409fc277aaa8efa826 Author: Emmanuele Bassi @@ -2559,7 +2985,7 @@ Date: Mon Mar 1 17:41:14 2010 +0000 barewords and wrong array and object closing braces. json-glib/json-parser.c | 117 +++++++++++++++++++++++++++++++---------------- - 1 files changed, 78 insertions(+), 39 deletions(-) + 1 file changed, 78 insertions(+), 39 deletions(-) commit 7d156366e9062349fbe58344712a055839449098 Author: Emmanuele Bassi @@ -2574,7 +3000,7 @@ Date: Sun Jan 24 19:09:28 2010 +0000 • dist-bzip2: generate a bz2 tarball when distchecking configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit ea666891cb1e6fc9e527ce6c93a306bc97145f16 Author: Emmanuele Bassi @@ -2587,7 +3013,7 @@ Date: Sun Jan 24 18:58:28 2010 +0000 update the example in the documentation. json-glib/json-gboxed.c | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) + 1 file changed, 6 insertions(+), 5 deletions(-) commit 4c15bf185dcd55ae5daf6b68d2b58d32e9ac9d5c Author: Emmanuele Bassi @@ -2601,7 +3027,7 @@ Date: Sun Jan 10 10:00:32 2010 +0000 --enable-maintainer-flags are turned off. configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit c09c2dc1c54c83fea4ef93486081fe3fab35452c Author: Emmanuele Bassi @@ -2613,7 +3039,7 @@ Date: Sun Jan 10 09:59:14 2010 +0000 initialize every member of the structure ourselves. json-glib/json-object.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit cdffa0eacb52479e04460d8436a08ccecce91edf Author: Emmanuele Bassi @@ -2624,7 +3050,7 @@ Date: Sat Jan 2 23:57:31 2010 +0000 The AM_CPPFLAGS variable is for pre-processor flags. tests/Makefile.am | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + 1 file changed, 3 insertions(+), 1 deletion(-) commit f20523412e737c2dfae92ba4b9bd86177fd018a0 Author: Emmanuele Bassi @@ -2636,7 +3062,7 @@ Date: Sat Jan 2 23:56:42 2010 +0000 library. json-glib/tests/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 7b72cad780fdeb42ac1d847210bd2022376f2875 Author: Emmanuele Bassi @@ -2646,8 +3072,8 @@ Date: Sat Jan 2 23:50:40 2010 +0000 Use typed accessors instead of using GValues all around. - json-glib/tests/generator-test.c | 141 ++++++------------------------------- - 1 files changed, 23 insertions(+), 118 deletions(-) + json-glib/tests/generator-test.c | 145 +++++++------------------------------- + 1 file changed, 25 insertions(+), 120 deletions(-) commit 3c33b61738d74b732805b497accec830b1a05796 Author: Emmanuele Bassi @@ -2659,7 +3085,7 @@ Date: Fri Jan 1 18:23:16 2010 +0000 are iterating on is the same returned by the get_elements() method. json-glib/tests/array-test.c | 22 +++++++++++++++++----- - 1 files changed, 17 insertions(+), 5 deletions(-) + 1 file changed, 17 insertions(+), 5 deletions(-) commit c8cc10985c3e7aac5ca1c03a7b443951929ed0cb Author: Emmanuele Bassi @@ -2671,7 +3097,7 @@ Date: Fri Jan 1 18:02:03 2010 +0000 have a similar rule in the top source directory as well. Makefile.am | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 file changed, 3 insertions(+) commit 060eddb098dd2b442f986a39aad2e7bf8c777a15 Author: Emmanuele Bassi @@ -2684,7 +3110,7 @@ Date: Tue Dec 29 23:35:00 2009 +0000 garantee the order of a JsonObject members. json-glib/tests/generator-test.c | 102 +++++++++++++++++++++----------------- - 1 files changed, 56 insertions(+), 46 deletions(-) + 1 file changed, 56 insertions(+), 46 deletions(-) commit 37a9c9544447c4a8ac36d80dd58bd38f80b0aa3c Author: Emmanuele Bassi @@ -2693,7 +3119,7 @@ Date: Tue Dec 29 23:02:23 2009 +0000 Update the ignore file .gitignore | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) + 1 file changed, 3 insertions(+), 2 deletions(-) commit e32a157f97d96293f6f4061e7d0008d90ff16258 Author: Emmanuele Bassi @@ -2746,7 +3172,7 @@ Date: Tue Dec 29 21:56:42 2009 +0000 Bump to 0.11 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit dae32677d140a3ba6a15e1198b53ea0b3e1716b0 Author: Emmanuele Bassi @@ -2755,7 +3181,7 @@ Date: Tue Dec 29 15:35:21 2009 +0000 Post-release version bump to 0.10.1 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 5aff66e8fae3e28c9cb6b74696170154eed303a7 Author: Emmanuele Bassi @@ -2764,7 +3190,7 @@ Date: Tue Dec 29 15:33:28 2009 +0000 Release 0.10.0 configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 7258a776ea90ea4b2dcc6f1e4e440bb09c581a12 Author: Emmanuele Bassi @@ -2773,7 +3199,7 @@ Date: Tue Dec 29 15:31:22 2009 +0000 build: Enable introspection when distchecking Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 80c5178127052e600146ca889500e263da4ebf10 Author: Vincent Untz @@ -2791,7 +3217,7 @@ Date: Sun Dec 27 02:09:44 2009 +0100 Signed-off-by: Emmanuele Bassi json-glib/json-gobject.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit e3a57eae397926ad23e216996eda164ed6c15c63 Author: Emmanuele Bassi @@ -2800,7 +3226,7 @@ Date: Sun Nov 29 12:50:58 2009 +0000 Post-release bump to 0.9.3 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 4477758b73a0712fdef5e7907f6b6f4e0878428e Author: Emmanuele Bassi @@ -2809,7 +3235,7 @@ Date: Sun Nov 29 12:34:41 2009 +0000 Release 0.9.2 (0.10.0-rc1) configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 654f99c6b0d771cc6b4c68790ab164b0f691307d Author: Emmanuele Bassi @@ -2818,7 +3244,7 @@ Date: Sun Nov 29 12:34:08 2009 +0000 Update NEWS NEWS | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) + 1 file changed, 15 insertions(+) commit 307605046cf89ef922d1d1e7c7b95405f3ecfdfb Author: Emmanuele Bassi @@ -2827,7 +3253,7 @@ Date: Sun Nov 29 12:48:25 2009 +0000 docs: Fix annotation for json_gobject_to_data() json-glib/json-gobject.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit e7eb3ca4a9de1c7348dc82f528cf0858f52849dd Author: Emmanuele Bassi @@ -2836,7 +3262,7 @@ Date: Sun Nov 29 12:37:04 2009 +0000 docs: Add missing to/from_data methods doc/reference/json-glib-sections.txt | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit 27bb2c060a7b2ecc4839719d39b2044efe4c3e7a Author: Emmanuele Bassi @@ -2845,7 +3271,7 @@ Date: Sun Nov 29 12:46:27 2009 +0000 docs: Add release notes to the README README | 12 ++++++++++-- - 1 files changed, 10 insertions(+), 2 deletions(-) + 1 file changed, 10 insertions(+), 2 deletions(-) commit 780d82310c47c3f07bcbaab2cefbea0d6decb899 Author: Emmanuele Bassi @@ -2854,7 +3280,7 @@ Date: Sun Nov 29 12:33:45 2009 +0000 docs: Update the README README | 27 ++++++++++++++++----------- - 1 files changed, 16 insertions(+), 11 deletions(-) + 1 file changed, 16 insertions(+), 11 deletions(-) commit d122f9b8c09ad7e82b1a70da5d65ebba2111e6cc Author: Emmanuele Bassi @@ -2865,7 +3291,7 @@ Date: Sun Nov 29 12:33:01 2009 +0000 Make the output of the summary a little bit nicer. configure.ac | 27 ++++++++++++++++++++------- - 1 files changed, 20 insertions(+), 7 deletions(-) + 1 file changed, 20 insertions(+), 7 deletions(-) commit e4c4480036a82cc5177fc1f184c18019af0e805e Author: Emmanuele Bassi @@ -2877,7 +3303,7 @@ Date: Sun Nov 29 12:31:54 2009 +0000 version allows us to pass the .la file to g-ir-scanner. configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 4445bdb04d5eebc145a1db82aa5b811e8d4ed048 Author: Emmanuele Bassi @@ -2890,7 +3316,7 @@ Date: Sat Nov 28 19:13:27 2009 +0000 function registration. json-glib/json-gobject.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 793e827feaa9be3c4ffbe5c0425ac6bcc0c9e6d1 Author: Emmanuele Bassi @@ -2899,7 +3325,7 @@ Date: Sat Nov 28 19:06:36 2009 +0000 build: Clean up json-glib/Makefile.am rules json-glib/Makefile.am | 24 ++++-------------------- - 1 files changed, 4 insertions(+), 20 deletions(-) + 1 file changed, 4 insertions(+), 20 deletions(-) commit 97584658672fe4709fc7c3b24a44b477112322f7 Author: Emmanuele Bassi @@ -2908,7 +3334,7 @@ Date: Sat Nov 28 17:39:37 2009 +0000 build: Fix out-of-tree enum types file generation build/autotools/Makefile.am.enums | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 3cf919e9c7f3201305a1a63a3c270e422a37efed Author: Emmanuele Bassi @@ -2950,9 +3376,9 @@ Date: Mon Nov 23 22:20:58 2009 +0000 doc/reference/json-glib-sections.txt | 3 +- json-glib/json-gboxed.c | 115 ++++++++++++++++++++++------------ json-glib/json-gobject.c | 4 +- - json-glib/json-gobject.h | 59 +++++++++--------- - tests/test-serialize-boxed.c | 7 +- - 5 files changed, 112 insertions(+), 76 deletions(-) + json-glib/json-gobject.h | 63 ++++++++++--------- + tests/test-serialize-boxed.c | 7 ++- + 5 files changed, 114 insertions(+), 78 deletions(-) commit 61d54cc9e2a3098e876e700a9248428f400a5368 Author: Tristan Van Berkom @@ -2973,7 +3399,7 @@ Date: Thu Nov 12 12:59:03 2009 +0000 Signed-off-by: Emmanuele Bassi json-glib/json-gobject.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) + 1 file changed, 5 insertions(+), 2 deletions(-) commit 63dc03da507a216c0764bc0e50fc62b2b77dc1b2 Author: Emmanuele Bassi @@ -2990,7 +3416,7 @@ Date: Thu Nov 12 12:38:29 2009 +0000 simplify the required code. doc/reference/json-glib-sections.txt | 4 ++ - json-glib/json-gobject.h | 28 +++++++--- + json-glib/json-gobject.h | 28 +++++++---- json-glib/json-serializable.c | 92 ++++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+), 9 deletions(-) @@ -3004,7 +3430,7 @@ Date: Thu Nov 12 12:03:13 2009 +0000 JSON_DISABLE_DEPRECATED. json-glib/json-gobject.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 3c7811bf24d4b957da730949af6795b728db5bad Author: Emmanuele Bassi @@ -3015,7 +3441,7 @@ Date: Thu Nov 12 12:02:41 2009 +0000 Make sure that JSON-GLib is built without using deprecated API. json-glib/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit 923311ee52b77f53c5c529e497ea2a24efaf23ea Author: Emmanuele Bassi @@ -3042,7 +3468,7 @@ Date: Thu Nov 12 11:57:45 2009 +0000 what we expect it to be when it is parsed. tests/test-serialize-complex.c | 32 ++++++++++++++++++++++++++++++++ - 1 files changed, 32 insertions(+), 0 deletions(-) + 1 file changed, 32 insertions(+) commit 7cebdd008a02e6cef0514f40327f94eba2a2088e Author: Cornelius Hald @@ -3061,7 +3487,7 @@ Date: Thu Nov 12 11:37:54 2009 +0000 Signed-off-by: Emmanuele Bassi json-glib/json-generator.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) + 1 file changed, 6 insertions(+), 1 deletion(-) commit 30d4efb775cb416212c00e3ececb0f0147739f40 Author: Emmanuele Bassi @@ -3087,7 +3513,7 @@ Date: Thu Nov 12 11:27:36 2009 +0000 build: Add more flags to the maintainer cflags list configure.ac | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + 1 file changed, 3 insertions(+), 1 deletion(-) commit ecc185d1c542f6ff41f84be026dc380f611a5d6e Author: Emmanuele Bassi @@ -3100,7 +3526,7 @@ Date: Thu Nov 12 10:09:17 2009 +0000 enumeration data from the GEnumClass. json-glib/json-enum-types.c.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 84f5af58c23b174cc9708e81ce8ccbfffa6e68eb Author: Emmanuele Bassi @@ -3116,7 +3542,7 @@ Date: Fri Oct 30 10:46:32 2009 +0000 the hash table only for storage and lookup purposes. json-glib/json-object.c | 55 ++++++----------------------------------------- - 1 files changed, 7 insertions(+), 48 deletions(-) + 1 file changed, 7 insertions(+), 48 deletions(-) commit a25a1ded25e5d1f605cffd6da7a5e036151aa70c Author: Mathias Hasselmann @@ -3129,7 +3555,7 @@ Date: Thu Oct 29 14:01:04 2009 +0000 Signed-off-by: Emmanuele Bassi tests/test-parser.c | 38 +++++++++++++++++++++++++++++++++----- - 1 files changed, 33 insertions(+), 5 deletions(-) + 1 file changed, 33 insertions(+), 5 deletions(-) commit 026ea0357fbe95e2acd43555e3b5d00e329c9740 Author: Emmanuele Bassi @@ -3141,7 +3567,7 @@ Date: Thu Oct 29 13:59:44 2009 +0000 the tokenizer in order to place them into the JsonNode. json-glib/json-parser.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit 578111be53065a2bbeda73865bfa4e178f185649 Author: Emmanuele Bassi @@ -3157,7 +3583,7 @@ Date: Wed Oct 28 16:54:34 2009 +0000 well: json-glib/json-object.h does not exist. json-glib/Makefile.am | 11 ++++++++--- - 1 files changed, 8 insertions(+), 3 deletions(-) + 1 file changed, 8 insertions(+), 3 deletions(-) commit 8f8ce87730fc0bf102a707e84c4f6106b215cfab Author: Emmanuele Bassi @@ -3186,7 +3612,7 @@ Date: Wed Oct 28 16:23:39 2009 +0000 json_gobject_from_data() correctly uses gssize instead. json-glib/json-gobject.c | 63 +++++++++++++++++++++++++++++++++++++++++++--- - json-glib/json-gobject.h | 10 +++++++ + json-glib/json-gobject.h | 10 ++++++++ 2 files changed, 69 insertions(+), 4 deletions(-) commit 00b4d200849e232cd904d23d3593d6f95252b483 @@ -3204,7 +3630,7 @@ Date: Wed Oct 28 16:05:19 2009 +0000 doc/reference/json-glib-sections.txt | 4 +- json-glib/json-gobject.c | 82 ++++++++++++++++++++++------------ - json-glib/json-gobject.h | 10 ++-- + json-glib/json-gobject.h | 10 ++--- 3 files changed, 61 insertions(+), 35 deletions(-) commit fc0607c740b153acc96e4df12a12b042e08e831b @@ -3216,8 +3642,8 @@ Date: Wed Oct 28 12:01:21 2009 +0000 The json-boxed and json-serializable sections are missing the long description for the API reference. - json-glib/json-gboxed.c | 49 +++++++++++++++++++++++++++++++++++++--- - json-glib/json-serializable.c | 5 +++- + json-glib/json-gboxed.c | 49 +++++++++++++++++++++++++++++++++++++---- + json-glib/json-serializable.c | 5 ++++- 2 files changed, 49 insertions(+), 5 deletions(-) commit 498827110f3d635e545c7351732551676a06a1bf @@ -3227,7 +3653,7 @@ Date: Wed Oct 28 10:07:39 2009 +0000 docs: Add the 0.10 symbols index doc/reference/json-glib-docs.xml | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + 1 file changed, 5 insertions(+) commit 0979bbceb654c5e4b5dadf1e6f7e85bb9df87ca5 Author: Emmanuele Bassi @@ -3254,7 +3680,7 @@ Date: Tue Oct 27 20:57:52 2009 +0000 docs: Documentation fixes for gtk-doc json-glib/json-gboxed.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) + 1 file changed, 5 insertions(+), 3 deletions(-) commit c176f70e593c9cfb4901cd9f27ce54b8aa7152f2 Author: Emmanuele Bassi @@ -3302,7 +3728,7 @@ Date: Tue Oct 27 18:03:11 2009 +0000 we are iterating over. json-glib/json-gobject.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit ff986ee5b8df45255f4f5ab01be0bbad893bc55e Author: Emmanuele Bassi @@ -3340,7 +3766,7 @@ Date: Tue Oct 27 17:53:34 2009 +0000 Obviously, the whole machinery works only for GBoxed types that register the serialization and deserialization functions. - .gitignore | 68 ++++++----- + .gitignore | 68 +++++------ json-glib/json-gobject.c | 264 +++++++++++++++++++++++++++++++++++++++++- json-glib/json-gobject.h | 37 ++++++ tests/Makefile.am | 8 +- @@ -3357,7 +3783,7 @@ Date: Tue Oct 27 17:43:38 2009 +0000 json-glib/json-node.c | 23 ++++++++++++++++++++++- json-glib/json-types-private.h | 2 ++ - 2 files changed, 24 insertions(+), 1 deletions(-) + 2 files changed, 24 insertions(+), 1 deletion(-) commit 3f8990f7a4c362590f19e427aae2f68f27303fe6 Author: Emmanuele Bassi @@ -3369,7 +3795,7 @@ Date: Tue Oct 27 17:42:14 2009 +0000 updated. json-glib/json-gobject.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 8e550ac4dbb5500a40c7adad88868ede40397db7 Author: Emmanuele Bassi @@ -3378,7 +3804,7 @@ Date: Tue Oct 27 17:41:38 2009 +0000 Fix compiler warnings (remove unused variables) json-glib/json-gobject.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) + 1 file changed, 1 insertion(+), 2 deletions(-) commit 3b994a52d9c34f67e4ac52aa4bb0c380789fbd60 Author: Emmanuele Bassi @@ -3389,7 +3815,7 @@ Date: Tue Oct 27 17:40:55 2009 +0000 Apparently, the MAINTAINER_CFLAGS were ignored. configure.ac | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit 0810711a7fbb915ba9397a66e77babb30765d090 Author: Emmanuele Bassi @@ -3400,7 +3826,7 @@ Date: Tue Oct 27 17:40:23 2009 +0000 Use the Automake macro to enable per-target compiler flags. configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit d664f886372afbe1d54e633240e7b7e06ebc45c8 Author: Emmanuele Bassi @@ -3429,7 +3855,7 @@ Date: Tue Oct 27 14:01:24 2009 +0000 path. json-glib/json-gobject.c | 98 ++++++++++++++++++++++++++++++++++++++----- - tests/test-serialize-full.c | 11 +++-- + tests/test-serialize-full.c | 11 ++--- 2 files changed, 93 insertions(+), 16 deletions(-) commit 2616938c7c042fced9be197205a535a8b420534e @@ -3454,19 +3880,19 @@ Date: Tue Oct 27 11:57:38 2009 +0000 .gitignore | 4 +- Makefile.am | 5 +- - Makefile.decl | 61 ------------------------- + Makefile.decl | 61 ------------------------ build/Makefile.am | 12 ++++- build/autotools/Makefile.am | 21 +++++++-- build/autotools/Makefile.am.enums | 43 +++++++++++++++++ - build/autotools/Makefile.am.gtest | 61 +++++++++++++++++++++++++ + build/autotools/Makefile.am.gtest | 61 ++++++++++++++++++++++++ build/autotools/Makefile.am.marshal | 45 ++++++++++++++++++ build/autotools/Makefile.am.silent | 17 +++++++ doc/Makefile.am | 12 ++++- doc/reference/Makefile.am | 5 +- - json-glib/Makefile.am | 86 +++++++++++------------------------ + json-glib/Makefile.am | 88 +++++++++++------------------------ json-glib/tests/Makefile.am | 12 +++-- - tests/Makefile.am | 15 +++---- - 14 files changed, 251 insertions(+), 148 deletions(-) + tests/Makefile.am | 15 +++--- + 14 files changed, 252 insertions(+), 149 deletions(-) commit 5406301b0e3bf74c0d7ae47a618c416d5c6dc29d Author: Emmanuele Bassi @@ -3478,7 +3904,7 @@ Date: Tue Oct 27 11:30:55 2009 +0000 defined using GParamSpecObject. json-glib/json-gobject.c | 14 ++++++++++++++ - 1 files changed, 14 insertions(+), 0 deletions(-) + 1 file changed, 14 insertions(+) commit 3a2176ebf96b33716d1b50068ca44b1d3cd9b0c8 Author: Emmanuele Bassi @@ -3492,7 +3918,7 @@ Date: Tue Oct 27 11:29:32 2009 +0000 the object. tests/test-serialize-simple.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 1ff48cdc5d773925bda1ddf8bc904a9ea6a5e643 Author: Emmanuele Bassi @@ -3505,7 +3931,7 @@ Date: Tue Oct 27 11:18:51 2009 +0000 part of json_serialize_gobject() into its own private function. json-glib/json-gobject.c | 113 +++++++++++++++++++++++++--------------------- - 1 files changed, 61 insertions(+), 52 deletions(-) + 1 file changed, 61 insertions(+), 52 deletions(-) commit 27afed8dc89bf9562c3536f0a053d250e70eea4d Author: Emmanuele Bassi @@ -3524,8 +3950,8 @@ Date: Tue Oct 27 10:30:27 2009 +0000 GObject has been updated to include a property holding a GObject. - json-glib/json-gobject.c | 14 +++++++++- - tests/test-serialize-full.c | 58 +++++++++++++++++++++++++++++++++++++----- + json-glib/json-gobject.c | 14 ++++++++++- + tests/test-serialize-full.c | 58 +++++++++++++++++++++++++++++++++++++------ 2 files changed, 64 insertions(+), 8 deletions(-) commit 317447b52455c56b0123168ab127ce026d7d0c22 @@ -3539,7 +3965,7 @@ Date: Tue Oct 27 10:20:42 2009 +0000 the parsing. json-glib/json-gobject.c | 152 +++++++++++++++++++++++++--------------------- - 1 files changed, 83 insertions(+), 69 deletions(-) + 1 file changed, 83 insertions(+), 69 deletions(-) commit cba7db96581343e3cbd8e5eb067026efb8cac24e Author: Emmanuele Bassi @@ -3586,7 +4012,7 @@ Date: Mon Sep 28 14:02:14 2009 +0100 json-glib/tests/object-test.c | 13 +++++++++++++ tests/test-parser.c | 1 + - 2 files changed, 14 insertions(+), 0 deletions(-) + 2 files changed, 14 insertions(+) commit 5181bf24bf3cde743de590ab3ffa0471df9e4799 Author: Emmanuele Bassi @@ -3595,7 +4021,7 @@ Date: Tue Sep 22 15:42:34 2009 +0100 Post-branch bump to 0.9.1 configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 3f83767109979c660469b3b5862fbd04469a8011 Author: Emmanuele Bassi @@ -3618,7 +4044,7 @@ Date: Tue Sep 22 15:34:18 2009 +0100 will be correct. json-glib/json-parser.c | 16 ++++++++++++++-- - 1 files changed, 14 insertions(+), 2 deletions(-) + 1 file changed, 14 insertions(+), 2 deletions(-) commit f99cf3d3d038eff786f85409f3d04736e2068e74 Author: Emmanuele Bassi @@ -3627,7 +4053,7 @@ Date: Tue Sep 22 15:34:07 2009 +0100 [parser] Whitespace clean up json-glib/json-parser.c | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) + 1 file changed, 6 insertions(+), 5 deletions(-) commit 6c20aae2b49a6d64db5e7d1ff3a82950ea9dc58a Author: Emmanuele Bassi @@ -3670,7 +4096,7 @@ Date: Sun Sep 6 17:15:46 2009 +0100 be moved to its own function to avoid duplication. json-glib/json-parser.c | 199 +++++++++++++++++++---------------------------- - tests/test-parser.c | 9 +- + tests/test-parser.c | 9 ++- 2 files changed, 86 insertions(+), 122 deletions(-) commit d3f005c27d9a8a46259205f2f8077fb01a6a3609 @@ -3686,7 +4112,7 @@ Date: Sun Sep 6 14:44:18 2009 +0100 for us, like the annotations glossary and the object tree. doc/reference/json-glib-docs.xml | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) + 1 file changed, 17 insertions(+) commit 7442a3011a860f12cbd40b6687b699b0b648d6b7 Author: Emmanuele Bassi @@ -3711,7 +4137,7 @@ Date: Sun Aug 16 05:52:46 2009 +0100 commit 8a7e0f381dc7e49745680df92ebb428f18bf4832. json-glib/json-object.c | 6 +----- - 1 files changed, 1 insertions(+), 5 deletions(-) + 1 file changed, 1 insertion(+), 5 deletions(-) commit 9362ccc891c914dbcf1be6bd067b0b37ae688057 Author: Emmanuele Bassi @@ -3720,7 +4146,7 @@ Date: Thu Aug 13 15:10:27 2009 +0100 [docs] Generate new symbols index for 0.6 and 0.8 doc/reference/json-glib-docs.xml | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) + 1 file changed, 8 insertions(+) commit 087bfe83412dca8de1b2dd67c74f490e44ecb96a Author: Emmanuele Bassi @@ -3729,7 +4155,7 @@ Date: Thu Aug 13 15:10:07 2009 +0100 [docs] Remove the version number from the title doc/reference/json-glib-docs.xml | 11 ++++++++--- - 1 files changed, 8 insertions(+), 3 deletions(-) + 1 file changed, 8 insertions(+), 3 deletions(-) commit c7d31d55b50b23c6c1067cb3541f73dddc12127a Author: Emmanuele Bassi @@ -3741,7 +4167,7 @@ Date: Thu Aug 13 15:08:56 2009 +0100 right namespace of JSON-GLib, and create a useful index. doc/reference/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit be07ba7b983b34231ad2f0fd7fe60ae47b14ce7e Author: Emmanuele Bassi @@ -3749,7 +4175,7 @@ Date: Thu Aug 13 14:51:42 2009 +0100 [docs] Rename main file to json-glib-docs.xml - doc/reference/Makefile.am | 36 +++++---- + doc/reference/Makefile.am | 36 ++++---- doc/reference/json-glib-docs.sgml | 163 ------------------------------------- doc/reference/json-glib-docs.xml | 163 +++++++++++++++++++++++++++++++++++++ 3 files changed, 182 insertions(+), 180 deletions(-) @@ -3761,7 +4187,7 @@ Date: Wed Aug 12 16:09:33 2009 +0100 Post-release version bump to 0.7.7 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit d5922b42604c09ba7ebcb0adc1566d0a33a99808 Author: Emmanuele Bassi @@ -3770,7 +4196,7 @@ Date: Wed Aug 12 16:06:40 2009 +0100 [release] 0.7.6 (brown paper bag) configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 9a647104ca77d4c4272845fed4bfae028098afd3 Author: Emmanuele Bassi @@ -3795,7 +4221,7 @@ Date: Wed Aug 12 14:08:35 2009 +0100 Post-release version bump to 0.7.5 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit c1c691fc6b58a990ee9bb17504189064051d5a12 Author: Emmanuele Bassi @@ -3804,7 +4230,7 @@ Date: Wed Aug 12 13:56:08 2009 +0100 [release] 0.7.4 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 12bc49ea08c50da9a7ed53c475fe873421432ebe Author: Emmanuele Bassi @@ -3813,7 +4239,7 @@ Date: Wed Aug 12 14:01:49 2009 +0100 Update the NEWS file NEWS | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit 75b888c26eebf7784c5af045a8c6af353e56b2e9 Author: Emmanuele Bassi @@ -3825,7 +4251,7 @@ Date: Wed Aug 12 13:59:52 2009 +0100 libtool script; shave will proxy it to the right place. json-glib/Makefile.am | 20 +++++++++++--------- - 1 files changed, 11 insertions(+), 9 deletions(-) + 1 file changed, 11 insertions(+), 9 deletions(-) commit d84c0f367b06e094ff693d60a724b9f141c33ca9 Author: Emmanuele Bassi @@ -3846,7 +4272,7 @@ Date: Wed Aug 12 13:48:17 2009 +0100 json-glib/json-parser.h | 4 ++++ json-glib/json-types.h | 4 ++++ json-glib/json-version.h.in | 4 ++++ - 6 files changed, 26 insertions(+), 0 deletions(-) + 6 files changed, 26 insertions(+) commit 3adba015e1c1f9edc7b7b2c4364d65f813216225 Author: Emmanuele Bassi @@ -3860,7 +4286,7 @@ Date: Wed Aug 12 13:46:46 2009 +0100 and not the plain json-glib.h. json-glib/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit a9386e20bf8e16e17a89dda24781c63bf495aa97 Author: Emmanuele Bassi @@ -3891,7 +4317,7 @@ Date: Wed Aug 12 12:29:34 2009 +0100 the member name or not. json-glib/json-object.c | 35 ++++++----------------------------- - 1 files changed, 6 insertions(+), 29 deletions(-) + 1 file changed, 6 insertions(+), 29 deletions(-) commit ad638149c2cc1a17c0d2ad1482d932c8940c64e0 Author: Emmanuele Bassi @@ -3900,7 +4326,7 @@ Date: Wed Aug 12 12:22:44 2009 +0100 Update NEWS NEWS | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit d87b18675ac02f42be23bf4070134690b8b9934b Author: Emmanuele Bassi @@ -3938,18 +4364,18 @@ Date: Wed Aug 12 12:13:11 2009 +0100 float -> G_TYPE_DOUBLE string -> G_TYPE_STRING - json-glib/json-array.c | 4 +- - json-glib/json-generator.c | 4 +- + json-glib/json-array.c | 4 +-- + json-glib/json-generator.c | 4 +-- json-glib/json-gobject.c | 58 ++++++++++++++++++++++++++++++--------- json-glib/json-node.c | 61 +++++++++++++++++++++++++++++++++-------- - json-glib/json-object.c | 4 +- + json-glib/json-object.c | 4 +-- json-glib/json-types.h | 12 ++++---- json-glib/tests/array-test.c | 2 +- json-glib/tests/node-test.c | 14 +++++----- json-glib/tests/object-test.c | 2 +- - tests/test-generator.c | 4 +- - tests/test-parser.c | 4 +- - tests/test-serialize-full.c | 9 +----- + tests/test-generator.c | 4 +-- + tests/test-parser.c | 4 +-- + tests/test-serialize-full.c | 9 ++---- 12 files changed, 121 insertions(+), 57 deletions(-) commit 7411cadc0fdd9ffc2bd7004c9980913ac857a495 @@ -3958,8 +4384,8 @@ Date: Sun Jun 28 23:52:34 2009 +0100 Indentation fixes - tests/test-parser.c | 94 +++++++++++++++++++++++++------------------------- - 1 files changed, 47 insertions(+), 47 deletions(-) + tests/test-parser.c | 98 +++++++++++++++++++++++++-------------------------- + 1 file changed, 49 insertions(+), 49 deletions(-) commit 112a8ec8dfd9c46304008b62e8ab256ed7714644 Author: Emmanuele Bassi @@ -3974,7 +4400,7 @@ Date: Sun Jun 28 23:49:51 2009 +0100 Thanks to Thomas Weidner for catching and reporting the issue. json-glib/json-parser.c | 16 +++++++++++----- - 1 files changed, 11 insertions(+), 5 deletions(-) + 1 file changed, 11 insertions(+), 5 deletions(-) commit 4ecdd6bedb7961f3a33971aa1f2338115a60f7f3 Author: Emmanuele Bassi @@ -3987,7 +4413,7 @@ Date: Sun Jun 28 23:48:36 2009 +0100 document, and JsonParser must create the correct JsonNode. tests/test-parser.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 59 insertions(+), 0 deletions(-) + 1 file changed, 59 insertions(+) commit 9a3b7a020716e23f1330915f1768a7c00bffbeb5 Author: Emmanuele Bassi @@ -3998,7 +4424,7 @@ Date: Thu Jun 25 10:37:43 2009 +0100 The passed value is a pointer to a JsonObject, not to a JsonArray. json-glib/json-object.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 68d872f15022217c0ff1cf516aec917d600fd762 Author: Rodrigo Moya @@ -4009,7 +4435,7 @@ Date: Wed Jun 24 14:07:18 2009 +0200 Reviewed by Emmanuele Bassi json-glib/json-object.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 6e706fb2b7a371f25c169ed25d4b617f2dc05b63 Author: Emmanuele Bassi @@ -4027,7 +4453,7 @@ Date: Sun Jun 21 10:58:24 2009 +0100 http://bugzilla.openedhand.com/show_bug.cgi?id=1648 json-glib/json-generator.c | 43 +++++++++++++++++++++++++++++++++---------- - 1 files changed, 33 insertions(+), 10 deletions(-) + 1 file changed, 33 insertions(+), 10 deletions(-) commit a9416b7e2823f1fffe639d90bb352a337815a70e Author: Emmanuele Bassi @@ -4036,7 +4462,7 @@ Date: Thu Jun 18 11:23:56 2009 +0100 Post-release bump to 0.7.3 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 1d13a409bb911141653a75d44e90feac9bfc2862 Author: Emmanuele Bassi @@ -4045,7 +4471,7 @@ Date: Thu Jun 18 11:20:35 2009 +0100 [release] 0.7.2 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit ff97e679522c52be6b5dfe0f851416cdeac7f921 Author: Emmanuele Bassi @@ -4054,7 +4480,7 @@ Date: Thu Jun 18 11:14:37 2009 +0100 [release] Update NEWS NEWS | 19 +++++++++++++++++++ - 1 files changed, 19 insertions(+), 0 deletions(-) + 1 file changed, 19 insertions(+) commit 182ca9cd9a3fabaa2533d841154856c61c570d08 Author: Emmanuele Bassi @@ -4079,7 +4505,7 @@ Date: Thu Jun 18 10:05:57 2009 +0100 documented or scanned. doc/reference/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit 41649f049637864cfce21f6615c7d8bcaf3f03b8 Author: Emmanuele Bassi @@ -4088,7 +4514,7 @@ Date: Thu Jun 18 10:03:23 2009 +0100 [docs] Update the README file README | 30 ++++++++++++++++++++---------- - 1 files changed, 20 insertions(+), 10 deletions(-) + 1 file changed, 20 insertions(+), 10 deletions(-) commit 97fc00b1a5e3878074488ee93d9b52570983da1f Author: Emmanuele Bassi @@ -4097,7 +4523,7 @@ Date: Thu Jun 18 10:03:05 2009 +0100 [build] Use AS_CASE m4 macro, instead of AS_IF configure.ac | 30 ++++++++++++++++-------------- - 1 files changed, 16 insertions(+), 14 deletions(-) + 1 file changed, 16 insertions(+), 14 deletions(-) commit 610cd260ac50c09809d6273c328ecea5a21f51bb Author: Emmanuele Bassi @@ -4106,7 +4532,7 @@ Date: Thu Jun 18 10:02:39 2009 +0100 [build] Require automake 1.10 configure.ac | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit bddc717b8b6f2f1501c30f78159c20394665d335 Author: Emmanuele Bassi @@ -4117,10 +4543,10 @@ Date: Tue Jun 9 11:48:02 2009 +0100 Build the Introspection data when compiling JSON-GLib; this way, the API should be available to other languages automatically. - .gitignore | 3 + - build/autotools/Makefile.am | 7 +++- + .gitignore | 3 ++ + build/autotools/Makefile.am | 7 ++- build/autotools/introspection.m4 | 88 ++++++++++++++++++++++++++++++++++++++ - configure.ac | 13 +++-- + configure.ac | 13 +++--- json-glib/Makefile.am | 30 +++++++++++++ 5 files changed, 135 insertions(+), 6 deletions(-) @@ -4135,7 +4561,7 @@ Date: Tue Jun 9 11:24:54 2009 +0100 build to handle gracefully different versions of GCC. .gitignore | 1 + - Makefile.am | 2 + + Makefile.am | 2 ++ build/autotools/Makefile.am | 2 +- build/autotools/as-compiler-flag.m4 | 62 +++++++++++++++++++++++++++++++++++ configure.ac | 5 ++- @@ -4158,7 +4584,7 @@ Date: Tue Jun 9 11:15:53 2009 +0100 [git ignore] Add m4 files under build/ .gitignore | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 file changed, 3 insertions(+) commit c12786444e0175464295fb9a98c600060bffa0ed Author: Emmanuele Bassi @@ -4200,14 +4626,14 @@ Date: Tue Jun 9 11:05:23 2009 +0100 json-glib/Makefile.am | 1 + json-glib/json-array.c | 9 +----- - json-glib/json-generator.c | 2 + - json-glib/json-gobject.c | 2 + + json-glib/json-generator.c | 2 ++ + json-glib/json-gobject.c | 2 ++ json-glib/json-node.c | 2 +- json-glib/json-object.c | 9 +----- - json-glib/json-parser.c | 2 + + json-glib/json-parser.c | 2 ++ json-glib/json-types-private.h | 61 ++++++++++++++++++++++++++++++++++++++++ - json-glib/json-types.h | 38 +++++++++--------------- - json-glib/tests/node-test.c | 8 ++-- + json-glib/json-types.h | 38 +++++++++---------------- + json-glib/tests/node-test.c | 8 +++--- 10 files changed, 89 insertions(+), 45 deletions(-) commit 930fdf4c4dff1f5310a946c2a9f5b6860f7c8ba8 @@ -4220,11 +4646,11 @@ Date: Sun May 17 19:44:41 2009 +0100 json_array_foreach_element() iterates over a JSON array data type. - doc/reference/json-glib-sections.txt | 2 + - json-glib/json-array.c | 35 ++++++++++++++++++++++++ + doc/reference/json-glib-sections.txt | 2 ++ + json-glib/json-array.c | 35 +++++++++++++++++++++++++ json-glib/json-types.h | 21 +++++++++++++++ json-glib/tests/array-test.c | 48 ++++++++++++++++++++++++++++++++++ - 4 files changed, 106 insertions(+), 0 deletions(-) + 4 files changed, 106 insertions(+) commit 3057a1722e27a13b39ddec4754fb6abda1aea199 Author: Emmanuele Bassi @@ -4235,9 +4661,9 @@ Date: Sat May 16 20:09:07 2009 +0100 The json_object_foreach_member() function iterates over a JsonObject data type. - doc/reference/json-glib-sections.txt | 2 + + doc/reference/json-glib-sections.txt | 2 ++ json-glib/json-object.c | 55 ++++++++++++++++++++++++++++++++ - json-glib/json-types.h | 25 +++++++++++++- + json-glib/json-types.h | 25 +++++++++++++-- json-glib/tests/object-test.c | 57 ++++++++++++++++++++++++++++++++++ 4 files changed, 137 insertions(+), 2 deletions(-) @@ -4252,7 +4678,7 @@ Date: Sat May 16 13:53:58 2009 +0100 with GOnce to enable atomic (and thread-safe) type registration. json-glib/json-enum-types.c.in | 18 +++++++++++++----- - 1 files changed, 13 insertions(+), 5 deletions(-) + 1 file changed, 13 insertions(+), 5 deletions(-) commit 43d4bd151cd6979ecc6fdad5fab3e7988117c7be Author: Emmanuele Bassi @@ -4261,7 +4687,7 @@ Date: Sun Apr 19 00:36:08 2009 +0100 [doap] Add a category element json-glib.doap | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit 58999bddac74c176fbd8544fa2cd30e2f067d863 Author: Emmanuele Bassi @@ -4275,7 +4701,7 @@ Date: Fri Apr 17 15:45:42 2009 +0100 doc/reference/json-glib-sections.txt | 1 + json-glib/json-node.c | 20 ++++++++++++++++++++ json-glib/json-types.h | 1 + - 3 files changed, 22 insertions(+), 0 deletions(-) + 3 files changed, 22 insertions(+) commit ba46d8e07a8e2dd50a3b1fff8b8c3303e3686480 Author: Emmanuele Bassi @@ -4290,7 +4716,7 @@ Date: Fri Apr 17 15:38:40 2009 +0100 us a little bit more of future compatibility. json-glib/json-types.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit d1e7d1ecd05687624f7149dad75a5fac9a645e72 Author: Emmanuele Bassi @@ -4330,7 +4756,7 @@ Date: Fri Apr 17 15:19:42 2009 +0100 docbook. doc/reference/version.xml.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit cbc92b72b2d7870a916f24055f8c2aa2371aa4ea Author: Emmanuele Bassi @@ -4342,8 +4768,8 @@ Date: Fri Apr 17 15:02:44 2009 +0100 the typed JsonNode accessors and the newly added JsonObject and JsonArray typed accessors. - tests/test-generator.c | 63 +++++++---------------------------------------- - 1 files changed, 10 insertions(+), 53 deletions(-) + tests/test-generator.c | 63 ++++++++---------------------------------------- + 1 file changed, 10 insertions(+), 53 deletions(-) commit e437ce609e333c5b8ede21174dfba032c1bbfb00 Author: Emmanuele Bassi @@ -4359,9 +4785,9 @@ Date: Fri Apr 17 14:49:25 2009 +0100 As for JsonObject, the amount of types is small enough to avoid the combinatorial API explosion. - doc/reference/json-glib-sections.txt | 22 ++- + doc/reference/json-glib-sections.txt | 22 +- json-glib/json-array.c | 386 ++++++++++++++++++++++++++++++++++ - json-glib/json-types.h | 57 ++++-- + json-glib/json-types.h | 57 +++-- 3 files changed, 447 insertions(+), 18 deletions(-) commit 4819ca625d1b73270797f913495a3835297950c2 @@ -4409,7 +4835,7 @@ Date: Fri Apr 17 11:35:57 2009 +0100 doc/reference/json-glib-sections.txt | 17 ++ json-glib/json-object.c | 489 ++++++++++++++++++++++++++++++++-- - json-glib/json-types.h | 83 +++++-- + json-glib/json-types.h | 83 ++++-- 3 files changed, 555 insertions(+), 34 deletions(-) commit 2a768cb5e553afc4a9ac0d9bf1dc36a183821983 @@ -4423,7 +4849,7 @@ Date: Thu Apr 16 19:57:11 2009 +0100 GNOME userid. json-glib.doap | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 file changed, 3 insertions(+) commit 17822292acb4d1c9b4f414ea0e4b858809d3b858 Author: Emmanuele Bassi @@ -4434,7 +4860,7 @@ Date: Thu Apr 16 18:18:45 2009 +0100 Describe the releases of the 0.6 cycle. json-glib.doap | 18 ++++++++++++++++++ - 1 files changed, 18 insertions(+), 0 deletions(-) + 1 file changed, 18 insertions(+) commit 470f3a4299153362deea260c806d9b87870af3de Author: Emmanuele Bassi @@ -4446,7 +4872,7 @@ Date: Thu Apr 16 18:03:31 2009 +0100 GNOME Cgit instance will pick up the DOAP file and update itself. json-glib.doap | 30 ++++++++++++++++++++++++++++++ - 1 files changed, 30 insertions(+), 0 deletions(-) + 1 file changed, 30 insertions(+) commit 764a3f79fe0d8d13e24bd921a16a46f4603bcbf1 Author: Emmanuele Bassi @@ -4457,7 +4883,7 @@ Date: Thu Apr 16 11:28:24 2009 +0100 Every GNOME project needs a MAINTAINERS file. MAINTAINERS | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 file changed, 3 insertions(+) commit f9956b4eadcfc9bbd5c0bc4b861ff782779e8a9a Author: Emmanuele Bassi @@ -4481,7 +4907,7 @@ Date: Tue Apr 14 00:09:35 2009 +0100 thorough test unit for the JsonNode copy operation. json-glib/json-node.c | 2 +- - json-glib/tests/node-test.c | 45 +++++++++++++++++++++++++++++++++++++++++- + json-glib/tests/node-test.c | 45 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 3 deletions(-) commit e2c65a75d68aafa26f2084928e732961e48beb99 @@ -4496,16 +4922,16 @@ Date: Mon Apr 13 23:46:52 2009 +0100 Also, use Shave to sanitize the libtool and compiler incantations and restore sanity to the build system. - .gitignore | 5 ++ + .gitignore | 5 +++ autogen.sh | 9 ++++ build/Makefile.am | 1 + - build/autotools/Makefile.am | 3 + + build/autotools/Makefile.am | 3 ++ build/autotools/shave-libtool.in | 69 +++++++++++++++++++++++++++++ build/autotools/shave.in | 79 +++++++++++++++++++++++++++++++++ build/autotools/shave.m4 | 77 ++++++++++++++++++++++++++++++++ - configure.ac | 88 +++++++++++++++++++++---------------- + configure.ac | 90 +++++++++++++++++++++----------------- json-glib/Makefile.am | 89 +++++++++++++++++++------------------ - 9 files changed, 339 insertions(+), 81 deletions(-) + 9 files changed, 340 insertions(+), 82 deletions(-) commit 8080df63b4b4eae3b59d1214fc67f48149f49773 Author: Emmanuele Bassi @@ -4519,7 +4945,7 @@ Date: Mon Apr 13 22:25:42 2009 +0100 Thanks to: Gordon Williams json-glib/json-parser.c | 38 +++++++++++++++++++++++++++++++++----- - 1 files changed, 33 insertions(+), 5 deletions(-) + 1 file changed, 33 insertions(+), 5 deletions(-) commit ca329a7d5c1185cdf15fb85891693eca30295de1 Author: Emmanuele Bassi @@ -4531,7 +4957,7 @@ Date: Mon Apr 13 22:30:05 2009 +0100 I also need to show what an assignment looks like. json-glib/json-parser.c | 17 ++++++++++++----- - 1 files changed, 12 insertions(+), 5 deletions(-) + 1 file changed, 12 insertions(+), 5 deletions(-) commit b28d5894060aac1239e23665f42be3946b5450e7 Author: Emmanuele Bassi @@ -4542,7 +4968,7 @@ Date: Mon Apr 13 22:29:36 2009 +0100 Add more spaces and remove the ` from the error message. json-glib/json-parser.c | 18 ++++++++++++------ - 1 files changed, 12 insertions(+), 6 deletions(-) + 1 file changed, 12 insertions(+), 6 deletions(-) commit a19a51df9e95e36edf949e68581731bd31959081 Author: Emmanuele Bassi @@ -4559,7 +4985,7 @@ Date: Mon Apr 13 22:08:21 2009 +0100 Reported by: Jasper tests/test-serialize-full.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit e583a9ec95f3d157091ec1e1a2ac8c493f0e23b2 Author: Emmanuele Bassi @@ -4571,7 +4997,7 @@ Date: Mon Apr 13 22:04:10 2009 +0100 GNOME provides instead of calling autoreconf. autogen.sh | 21 ++++++++------------- - 1 files changed, 8 insertions(+), 13 deletions(-) + 1 file changed, 8 insertions(+), 13 deletions(-) commit 1d92c73bc05423872581d513f355783d4864edd5 Author: Emmanuele Bassi @@ -4595,8 +5021,8 @@ Date: Fri Nov 28 17:24:15 2008 +0000 perform type checks and requires that the length of the memory buffer containing the JSON data stream is already a positive integer. - json-glib/json-parser.c | 175 +++++++++++++++++++++++++++------------------- - 1 files changed, 103 insertions(+), 72 deletions(-) + json-glib/json-parser.c | 175 ++++++++++++++++++++++++++++------------------- + 1 file changed, 103 insertions(+), 72 deletions(-) commit 6e7958785096806b3ffa60a4937642d713a051f2 Author: Emmanuele Bassi @@ -4623,7 +5049,7 @@ Date: Fri Nov 28 17:19:17 2008 +0000 directly on stderr. json-glib/json-parser.c | 28 ++++++++++++++++++++++++++-- - 1 files changed, 26 insertions(+), 2 deletions(-) + 1 file changed, 26 insertions(+), 2 deletions(-) commit a5bea353dead0bd69f9664df86050fc829a2dcd5 Author: Emmanuele Bassi @@ -4632,7 +5058,7 @@ Date: Mon Nov 3 16:01:03 2008 +0000 Bump to 0.7.1 after stable branch configure.ac | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit cf4c7360c69c0fe7587ec2456cd10839e1d0c1d6 Author: Emmanuele Bassi @@ -4653,7 +5079,7 @@ Date: Mon Nov 3 15:51:21 2008 +0000 Signed-off-by: Emmanuele Bassi json-glib/json-gobject.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + 1 file changed, 3 insertions(+), 1 deletion(-) commit 9b94bc7f99063f45a2725861369f36b53ec3d440 Author: Emmanuele Bassi @@ -4662,7 +5088,7 @@ Date: Fri Jun 13 11:56:46 2008 +0100 Sync up with the current stable release numbers configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 4dd392342003147d55eee98db50e11d344b287d4 Author: Emmanuele Bassi @@ -4671,7 +5097,7 @@ Date: Fri Jun 13 11:27:50 2008 +0100 Fix a variable shadowing json-glib/json-generator.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) commit a02a42ef47e61456747e511556097b903f07d68a Merge: fdbad1c bc5c722 @@ -4697,7 +5123,7 @@ Date: Fri Jun 13 11:22:35 2008 +0100 Makefile.am | 6 +++++- configure.ac | 3 +++ json-glib/Makefile.am | 2 ++ - 3 files changed, 10 insertions(+), 1 deletions(-) + 3 files changed, 10 insertions(+), 1 deletion(-) commit fdbad1cfd6ad6da9fab631f945ab8d2e85228fdf Author: Emmanuele Bassi @@ -4716,7 +5142,7 @@ Date: Fri Jun 13 11:06:15 2008 +0100 Signed-off-by: Emmanuele Bassi json-glib/json-generator.c | 17 ++++++++++++++++- - 1 files changed, 16 insertions(+), 1 deletions(-) + 1 file changed, 16 insertions(+), 1 deletion(-) commit 81c02ef3db6901655f8a7117e5e2675d37096daf Author: Emmanuele Bassi @@ -4727,7 +5153,7 @@ Date: Sun May 18 11:56:04 2008 +0100 The json-scanner.h header file is not shipped with JSON-GLib anymore. json-glib/json-glib.h | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + 1 file changed, 1 deletion(-) commit 9713843a4294b3e35a29125bf2bf1867a6443f27 Author: Emmanuele Bassi @@ -4735,7 +5161,7 @@ Date: Tue May 6 11:48:25 2008 +0100 Remove debian packaging - debian/changelog | 5 --- + debian/changelog | 5 ---- debian/compat | 1 - debian/control | 61 --------------------------------------- debian/copyright | 27 ----------------- @@ -4743,8 +5169,8 @@ Date: Tue May 6 11:48:25 2008 +0100 debian/libjson-glib-doc.install | 1 - debian/libjson-glib-doc.links | 1 - debian/libjson-glib0.install | 1 - - debian/rules | 12 ------- - 9 files changed, 0 insertions(+), 112 deletions(-) + debian/rules | 12 -------- + 9 files changed, 112 deletions(-) commit d67000ab6c5ae6710f48f0517c98600af7cdaa0e Author: Emmanuele Bassi @@ -4753,7 +5179,7 @@ Date: Mon May 5 23:17:58 2008 +0100 Update changelog for the debian packages debian/changelog | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) + 1 file changed, 1 insertion(+), 2 deletions(-) commit 0830873edc5203655f04868184cedb428b6d2d54 Author: Emmanuele Bassi @@ -4761,8 +5187,8 @@ Date: Mon May 5 23:16:38 2008 +0100 Update git ignore file - .gitignore | 72 ++++++++++++++++++----------------------------------------- - 1 files changed, 22 insertions(+), 50 deletions(-) + .gitignore | 72 +++++++++++++++++++----------------------------------------- + 1 file changed, 22 insertions(+), 50 deletions(-) commit eb1cd29f78ff52e3ec3b063716fb86b5f2c5ae4a Author: Emmanuele Bassi @@ -4774,14 +5200,14 @@ Date: Mon May 5 23:13:17 2008 +0100 repository and official packages, so there's no point in duplicating the effort here. - Makefile.am | 6 +-- + Makefile.am | 6 +- configure.ac | 15 ----- contrib/Makefile.am | 6 -- contrib/json-glib-1.0.deps | 1 - contrib/json-glib-1.0.vapi | 139 -------------------------------------------- contrib/json-object.vala | 46 --------------- contrib/json-test.vala | 122 -------------------------------------- - 7 files changed, 1 insertions(+), 334 deletions(-) + 7 files changed, 1 insertion(+), 334 deletions(-) commit 094acd1663210e803a8dab496f6de8066ef11f44 Author: Emmanuele Bassi @@ -4790,7 +5216,7 @@ Date: Mon May 5 12:44:29 2008 +0100 Bump to 0.6.1 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit a725bac9a287883f2d4f32130c7faedb121f754b Author: Emmanuele Bassi @@ -4799,7 +5225,7 @@ Date: Mon May 5 12:39:01 2008 +0100 Bump to 0.6.0 configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit cd598180b12a212525427a8cddf11bc0ed4f1836 Author: Emmanuele Bassi @@ -4808,7 +5234,7 @@ Date: Mon May 5 12:38:50 2008 +0100 Update NEWS for 0.6.0 NEWS | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + 1 file changed, 5 insertions(+) commit 26479ec3c342889a2ee822bdf73f2e5fb6e170d7 Merge: 8b5b5f6 7ff9134 @@ -4829,7 +5255,7 @@ Date: Mon May 5 12:34:35 2008 +0100 the tarball. json-glib/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit 705a73eb3dfa2323ec86c1d299b567a15acde7a6 Author: Emmanuele Bassi @@ -4838,7 +5264,7 @@ Date: Mon May 5 12:24:22 2008 +0100 Style fixes for the configure output configure.ac | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) + 1 file changed, 5 insertions(+), 5 deletions(-) commit e017d392a281594e350a8d74c142cbe014753d7e Author: Emmanuele Bassi @@ -4850,7 +5276,7 @@ Date: Mon May 5 12:24:00 2008 +0100 libtool is '-version-info', not '-versio-info'. configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 2051be2f7185733bbc62d10ec096538fec924638 Author: Emmanuele Bassi @@ -4863,7 +5289,7 @@ Date: Mon May 5 12:22:59 2008 +0100 it when invoked with the --help command line switch. configure.ac | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) + 1 file changed, 6 insertions(+), 1 deletion(-) commit 4cb8a9078172c5f56ac5d56417b8656a7053df4a Author: Emmanuele Bassi @@ -4878,7 +5304,7 @@ Date: Mon May 5 12:21:40 2008 +0100 set up), do not fail and just provide a stub gtk-doc.make. autogen.sh | 28 +++++++++++++++++++++++++--- - 1 files changed, 25 insertions(+), 3 deletions(-) + 1 file changed, 25 insertions(+), 3 deletions(-) commit 1571fcddd6f2a245f4bb6ad64f82d24fc9c4cec0 Author: Emmanuele Bassi @@ -4891,7 +5317,7 @@ Date: Thu May 1 23:00:28 2008 +0100 they are correctly parsed and assigned to the instance. tests/test-serialize-full.c | 29 +++++++++++++++++++++++++++-- - 1 files changed, 27 insertions(+), 2 deletions(-) + 1 file changed, 27 insertions(+), 2 deletions(-) commit 4c11d0969a44bb70acf6463ef6305999ff443be2 Author: Emmanuele Bassi @@ -4907,7 +5333,7 @@ Date: Thu May 1 22:58:55 2008 +0100 one of the original strings). json-glib/json-gobject.c | 15 +++++---------- - 1 files changed, 5 insertions(+), 10 deletions(-) + 1 file changed, 5 insertions(+), 10 deletions(-) commit 7ff91344d21b0c26d3a3a2834dbf09286cb1f904 Author: Emmanuele Bassi @@ -4922,7 +5348,7 @@ Date: Thu May 1 16:08:15 2008 +0100 idea unless you read the Debian packaging rules. debian/rules | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) + 1 file changed, 3 deletions(-) commit e75321e64f17d69beac0c2e131572fe081680b08 Author: Emmanuele Bassi @@ -4941,8 +5367,8 @@ Date: Thu May 1 15:58:31 2008 +0100 debian/libjson-glib-doc.install | 1 + debian/libjson-glib-doc.links | 1 + debian/libjson-glib0.install | 1 + - debian/rules | 15 +++++++++ - 9 files changed, 116 insertions(+), 0 deletions(-) + debian/rules | 15 ++++++++++ + 9 files changed, 116 insertions(+) commit 30f9d47ecf43a17610cd9c0074ff832bfa37593c Author: Emmanuele Bassi @@ -4951,7 +5377,7 @@ Date: Thu Apr 24 15:47:11 2008 +0100 Test the equality of the serialize string length tests/test-serialize-simple.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 file changed, 3 insertions(+) commit 07c2b916dadb4b40fbaabf49f0e80941993cc2cf Author: Emmanuele Bassi @@ -4964,7 +5390,7 @@ Date: Thu Apr 24 15:02:33 2008 +0100 to the shared object. json-glib/Makefile.am | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) + 1 file changed, 5 insertions(+), 1 deletion(-) commit 179899e5da801fda0981a1d446ba420efd4021c1 Author: Emmanuele Bassi @@ -4973,7 +5399,7 @@ Date: Thu Apr 24 14:55:51 2008 +0100 Update git ignore file .gitignore | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + 1 file changed, 4 insertions(+) commit b0daf7e3a2529dd9950d77a96a10233d68778f32 Author: Emmanuele Bassi @@ -4985,7 +5411,7 @@ Date: Thu Apr 24 14:54:05 2008 +0100 expose as a public symbol. json-glib/json-glib.h | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit c7a7f429565195fe7aba56a254abf3637cf6fa8a Author: Emmanuele Bassi @@ -4998,7 +5424,7 @@ Date: Thu Apr 24 14:52:54 2008 +0100 macro are implied. doc/reference/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit 053bf43c813799c5f59e9241217fe31c560b5885 Author: Emmanuele Bassi @@ -5010,7 +5436,7 @@ Date: Thu Apr 24 14:52:07 2008 +0100 language bindings and other users of the library. json-glib/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit 5977d95866cd9763e97a47d6c9909e6a2fbf0ed1 Author: Emmanuele Bassi @@ -5019,7 +5445,7 @@ Date: Thu Apr 24 14:50:34 2008 +0100 Autogenerate the GTypes for the enumerations json-glib/Makefile.am | 70 +++++++++++++++++++++++++++++++++---------------- - 1 files changed, 47 insertions(+), 23 deletions(-) + 1 file changed, 47 insertions(+), 23 deletions(-) commit 356413e8840a614914b84f40b1d8476ba036ded4 Author: Emmanuele Bassi @@ -5032,7 +5458,7 @@ Date: Thu Apr 24 14:49:45 2008 +0100 json-glib/json-enum-types.c.in | 31 +++++++++++++++++++++++++++++++ json-glib/json-enum-types.h.in | 26 ++++++++++++++++++++++++++ - 2 files changed, 57 insertions(+), 0 deletions(-) + 2 files changed, 57 insertions(+) commit 7d57ffc03783defbfeb26e21a14e3df32555c29d Author: Emmanuele Bassi @@ -5041,7 +5467,7 @@ Date: Mon Apr 21 10:57:05 2008 +0100 Update git ignore file .gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit 7d259e03b9a556d155ade87417ab26830c3e7684 Author: Emmanuele Bassi @@ -5054,7 +5480,7 @@ Date: Sun Apr 20 22:43:32 2008 +0100 returned variable name is correct. tests/test-parser.c | 16 ++++++++++------ - 1 files changed, 10 insertions(+), 6 deletions(-) + 1 file changed, 10 insertions(+), 6 deletions(-) commit 6899bca0dcf72dac0cad9dcf1a7cd10159d471e5 Author: Emmanuele Bassi @@ -5066,7 +5492,7 @@ Date: Sat Apr 19 23:22:29 2008 +0100 object. tests/test-parser.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit 81addb645ac5fad28619bb660624902abe981377 Author: Emmanuele Bassi @@ -5078,7 +5504,7 @@ Date: Sat Apr 19 23:18:54 2008 +0100 other units. tests/test-parser.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + 1 file changed, 4 insertions(+) commit 22a0db88c14895f98db76bca3cb078fbd3a2b07d Author: Emmanuele Bassi @@ -5087,7 +5513,7 @@ Date: Sat Apr 19 23:09:32 2008 +0100 Whitespace fixes in the licensing notice json-glib/json-scanner.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 676592cef006de16d966a1ca0469ccd0556f0e4b Author: Emmanuele Bassi @@ -5096,7 +5522,7 @@ Date: Sat Apr 19 23:09:20 2008 +0100 Documentation fixes in JsonNode json-glib/json-node.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit bf2249a1855b6bebe0b3528b4d5321a1ebe4b9e7 Author: Emmanuele Bassi @@ -5108,7 +5534,7 @@ Date: Sat Apr 19 23:08:20 2008 +0100 and copy it. json-glib/json-node.c | 17 +++++++++++++---- - 1 files changed, 13 insertions(+), 4 deletions(-) + 1 file changed, 13 insertions(+), 4 deletions(-) commit c191b2f8a8159457db3333390be10d6c7c0d4336 Author: Emmanuele Bassi @@ -5138,7 +5564,7 @@ Date: Sat Apr 19 23:01:26 2008 +0100 parsing JSON. json-glib/Makefile.am | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) + 1 file changed, 3 insertions(+), 2 deletions(-) commit df2a310a6ed0a3b32415f53076ff4c053b3fd925 Author: Emmanuele Bassi @@ -5153,7 +5579,7 @@ Date: Sat Apr 19 22:59:28 2008 +0100 to them inside our API reference. doc/reference/Makefile.am | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) + 1 file changed, 4 insertions(+), 3 deletions(-) commit 6a3d8266efe505b29555db21658c241eba20fe2d Author: Emmanuele Bassi @@ -5166,7 +5592,7 @@ Date: Sat Apr 19 22:57:05 2008 +0100 pkg-config file of the library for its prefix. configure.ac | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + 1 file changed, 5 insertions(+) commit 4e5ec69cce8ab27f965985ba69ea11224ae39ffd Author: Emmanuele Bassi @@ -5175,7 +5601,7 @@ Date: Sat Apr 19 22:28:21 2008 +0100 Update the description and dependencies README | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) + 1 file changed, 6 insertions(+), 1 deletion(-) commit f65a5d5e30a1242a899149b732d1139891876014 Author: Emmanuele Bassi @@ -5184,7 +5610,7 @@ Date: Sat Apr 19 18:05:45 2008 +0100 Bump to 0.5.1 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit ab0da7c61bde715e99dd16027b198c7760b30922 Author: Emmanuele Bassi @@ -5193,7 +5619,7 @@ Date: Sat Apr 19 18:01:57 2008 +0100 Update for 0.5.0 release NEWS | 14 ++++++++++++++ - 1 files changed, 14 insertions(+), 0 deletions(-) + 1 file changed, 14 insertions(+) commit 203927c71231cf6cec6d88161211702b7105df2d Author: Emmanuele Bassi @@ -5202,7 +5628,7 @@ Date: Sat Apr 19 17:20:50 2008 +0100 Fix ignore rule .gitignore | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 76921ac27534aa0a25b39790ce4d99cf6e19a20c Author: Emmanuele Bassi @@ -5214,7 +5640,7 @@ Date: Sat Apr 19 17:19:30 2008 +0100 using the \uXXXX notation, as per RFC. tests/test-parser.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 67 insertions(+), 0 deletions(-) + 1 file changed, 67 insertions(+) commit 379a2fe972c6e7436be9f345fe018bf4fe575354 Author: Emmanuele Bassi @@ -5233,7 +5659,7 @@ Date: Sat Apr 19 17:16:28 2008 +0100 This allows full compatibility with JSON. json-glib/json-scanner.c | 56 +++++++++++++++++++++++++++++++++++++++++----- - 1 files changed, 50 insertions(+), 6 deletions(-) + 1 file changed, 50 insertions(+), 6 deletions(-) commit 9429ecaa88cdb6705189b6970481911f11339ff6 Merge: d313aa1 445a3f7 @@ -5255,7 +5681,7 @@ Date: Sat Apr 12 13:21:21 2008 +0100 expected JSON_NODE_VALUE. json-glib/json-node.c | 21 +++++++++++++++------ - 1 files changed, 15 insertions(+), 6 deletions(-) + 1 file changed, 15 insertions(+), 6 deletions(-) commit 4e826d9f209a8f68023bae54c91b2bbbb202a54a Merge: 98b6e5e 2a579b5 @@ -5271,7 +5697,7 @@ Date: Thu Apr 3 16:31:48 2008 +0100 Wrap the test report information section inside an info element Makefile.decl | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) + 1 file changed, 4 insertions(+), 2 deletions(-) commit 8e2e539d02b84e0fe452174f3dfab06f35a4e6a1 Author: Emmanuele Bassi @@ -5282,7 +5708,7 @@ Date: Sun Mar 9 20:52:29 2008 +0000 Test the GValue API for storing fundamental types into a JsonNode. json-glib/tests/node-test.c | 29 +++++++++++++++++++++++++++++ - 1 files changed, 29 insertions(+), 0 deletions(-) + 1 file changed, 29 insertions(+) commit 646b90e79d3424a332064a6a1e9fc62d1ce99386 Author: Emmanuele Bassi @@ -5291,7 +5717,7 @@ Date: Wed Mar 5 17:43:06 2008 +0000 Add package and version information to the test-report XML Makefile.decl | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit b8943381b0df44d9e6e21ae8321df2376c8458a8 Author: Emmanuele Bassi @@ -5302,7 +5728,7 @@ Date: Wed Mar 5 16:03:24 2008 +0000 Use a similar test unit as the JsonArray one, testing creation, empty objects, addition and removal of members. - .gitignore | 2 + + .gitignore | 2 ++ json-glib/tests/Makefile.am | 17 +++++++---- json-glib/tests/object-test.c | 62 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 6 deletions(-) @@ -5318,7 +5744,7 @@ Date: Wed Mar 5 15:46:41 2008 +0000 test cases clean. json-glib/tests/array-test.c | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) + 1 file changed, 12 insertions(+) commit 6aa1ddb891594e0f567bc3ebeb3bf5d3ab8e7e0c Author: Emmanuele Bassi @@ -5327,7 +5753,7 @@ Date: Tue Mar 4 13:07:08 2008 +0000 Clean the test-report XML output, if found Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 6eee8282d327614380854d572b2680f40b2faaf5 Author: Emmanuele Bassi @@ -5336,7 +5762,7 @@ Date: Tue Mar 4 12:37:52 2008 +0000 Update gitignore file .gitignore | 18 ++++++++---------- - 1 files changed, 8 insertions(+), 10 deletions(-) + 1 file changed, 8 insertions(+), 10 deletions(-) commit d5cb48681c68c3d53d8ec331ef37fb60820a9421 Author: Emmanuele Bassi @@ -5352,8 +5778,8 @@ Date: Tue Mar 4 12:30:48 2008 +0000 The API coverage for the data types is part of the json-glib/tests directory and will be expanded later. - tests/Makefile.am | 8 ++++- - tests/test-serialize-full.c | 56 ++++++++++++++++++++++++++---------------- + tests/Makefile.am | 8 +++++-- + tests/test-serialize-full.c | 56 +++++++++++++++++++++++++++---------------- 2 files changed, 41 insertions(+), 23 deletions(-) commit 1f6307ea2d7dc6ebe279d08b9f95f3074fbdd462 @@ -5416,7 +5842,7 @@ Date: Tue Mar 4 12:09:44 2008 +0000 tests. tests/test-06.c | 28 ++++++++++++++++++---------- - 1 files changed, 18 insertions(+), 10 deletions(-) + 1 file changed, 18 insertions(+), 10 deletions(-) commit 5cc1d3d6061830de403ccbc10c2414f29cd1cf82 Author: Emmanuele Bassi @@ -5433,7 +5859,7 @@ Date: Tue Mar 4 10:52:51 2008 +0000 just compare the length of the output. tests/Makefile.am | 4 + - tests/test-04.c | 238 ---------------------------- + tests/test-04.c | 238 ----------------------------- tests/test-05.c | 227 --------------------------- tests/test-generator.c | 399 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 403 insertions(+), 465 deletions(-) @@ -5445,7 +5871,7 @@ Date: Tue Mar 4 10:44:56 2008 +0000 Append to EXTRA_DIST, since it was defined elsewhere contrib/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 98b6e5e2f151c4ee800754675bf01e585fee850b Author: Emmanuele Bassi @@ -5454,7 +5880,7 @@ Date: Tue Mar 4 07:05:01 2008 +0000 Update the README README | 36 ++++++++++++++++++++++++++++++++++++ - 1 files changed, 36 insertions(+), 0 deletions(-) + 1 file changed, 36 insertions(+) commit 1a078c783a5a03b3367ce59eb25248dd6e23b5c6 Author: Emmanuele Bassi @@ -5463,7 +5889,7 @@ Date: Tue Mar 4 07:05:01 2008 +0000 Update the README README | 36 ++++++++++++++++++++++++++++++++++++ - 1 files changed, 36 insertions(+), 0 deletions(-) + 1 file changed, 36 insertions(+) commit 44891ea1040ceae95a994b646174696de7779ea1 Author: Emmanuele Bassi @@ -5472,7 +5898,7 @@ Date: Tue Mar 4 06:44:59 2008 +0000 Update gitignore file .gitignore | 11 +++++------ - 1 files changed, 5 insertions(+), 6 deletions(-) + 1 file changed, 5 insertions(+), 6 deletions(-) commit 3ea189acf52ea39653c6505c136f1f45a660a24c Author: Emmanuele Bassi @@ -5484,7 +5910,7 @@ Date: Tue Mar 4 06:34:11 2008 +0000 for the members of the simple objects test case. tests/test-parser.c | 31 ++++++++++++++++++++++++------- - 1 files changed, 24 insertions(+), 7 deletions(-) + 1 file changed, 24 insertions(+), 7 deletions(-) commit 40b3e9330f482e002aea90b0c1a4b9db2adffff0 Author: Emmanuele Bassi @@ -5506,7 +5932,7 @@ Date: Tue Mar 4 06:27:24 2008 +0000 case more reliable. tests/test-parser.c | 40 +++++++++++++++++++++++++++++++--------- - 1 files changed, 31 insertions(+), 9 deletions(-) + 1 file changed, 31 insertions(+), 9 deletions(-) commit 7e6dab14302b94979672acf81eec8710ea95e288 Author: Emmanuele Bassi @@ -5517,7 +5943,7 @@ Date: Sun Mar 2 17:44:27 2008 +0000 This simple unit will test the JsonArray API, as part of the coverage test for the JSON-GLib types. - json-glib/tests/Makefile.am | 10 ++++++-- + json-glib/tests/Makefile.am | 10 ++++++--- json-glib/tests/array-test.c | 50 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 3 deletions(-) @@ -5551,7 +5977,7 @@ Date: Sun Mar 2 14:58:58 2008 +0000 and remolding them into a more interesting test framework. tests/Makefile.am | 39 +++++---------------------------------- - 1 files changed, 5 insertions(+), 34 deletions(-) + 1 file changed, 5 insertions(+), 34 deletions(-) commit 1e6aa16a2a6432cf96d0a86d4650c13e63c67e43 Author: Emmanuele Bassi @@ -5560,7 +5986,7 @@ Date: Sun Mar 2 14:56:56 2008 +0000 Remove old, empty string test tests/test-01.c | 57 ------------------------------------------------------- - 1 files changed, 0 insertions(+), 57 deletions(-) + 1 file changed, 57 deletions(-) commit 989c807fd61cc65c1e4058c5d0794ae2fe438ba1 Author: Emmanuele Bassi @@ -5574,7 +6000,7 @@ Date: Sun Mar 2 14:56:28 2008 +0000 The JsonObject parsing test will also be merged later. tests/test-parser.c | 262 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 262 insertions(+), 0 deletions(-) + 1 file changed, 262 insertions(+) commit f1e1c0e7796903abb725e8216fc54f53573ecdc9 Author: Emmanuele Bassi @@ -5590,7 +6016,7 @@ Date: Sun Mar 2 10:51:09 2008 +0000 framework API. tests/test-01.c | 44 +++++++++++++++++++++++++++++++++++--------- - 1 files changed, 35 insertions(+), 9 deletions(-) + 1 file changed, 35 insertions(+), 9 deletions(-) commit cb5b3d5fa6244b0d20258203bd9df7e3148af57b Author: Emmanuele Bassi @@ -5602,7 +6028,7 @@ Date: Sun Mar 2 10:50:17 2008 +0000 original nodes are equivalent. json-glib/tests/node-test.c | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) + 1 file changed, 15 insertions(+) commit 40c757835e329fe01f8f22aba74d2e47f3a5e55c Author: Emmanuele Bassi @@ -5623,7 +6049,7 @@ Date: Sat Mar 1 19:35:47 2008 +0000 Update gitignore file .gitignore | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + 1 file changed, 4 insertions(+) commit e4be0d896359cc1d0ba99dd81a66855389ebd5df Author: Emmanuele Bassi @@ -5645,9 +6071,9 @@ Date: Sat Mar 1 19:30:41 2008 +0000 Makefile.am | 4 ++- Makefile.decl | 57 +++++++++++++++++++++++++++++++++++++++++++ - configure.ac | 3 +- + configure.ac | 3 ++- json-glib/Makefile.am | 9 ++++++- - json-glib/tests/Makefile.am | 15 +++++++++++ + json-glib/tests/Makefile.am | 15 ++++++++++++ json-glib/tests/node-test.c | 27 ++++++++++++++++++++ 6 files changed, 112 insertions(+), 3 deletions(-) @@ -5658,7 +6084,7 @@ Date: Fri Feb 29 16:40:33 2008 +0000 Update gitignore .gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit 8a2bb3c4400b9df6cd864eb29920a7767e8170c7 Author: Emmanuele Bassi @@ -5672,7 +6098,7 @@ Date: Fri Feb 29 16:37:18 2008 +0000 Also, use the Slice allocator for the ScannerKey structs. json-glib/json-scanner.c | 42 ++++++++++++++++++++---------------------- - 1 files changed, 20 insertions(+), 22 deletions(-) + 1 file changed, 20 insertions(+), 22 deletions(-) commit 42f7800c5b1c30ff187fc824a9bb39565033488e Author: Emmanuele Bassi @@ -5683,7 +6109,7 @@ Date: Fri Feb 29 16:01:48 2008 +0000 JsonParser now uses JsonScanner, the internal copy of GScanner. json-glib/json-parser.c | 33 +++++++++++++++++---------------- - 1 files changed, 17 insertions(+), 16 deletions(-) + 1 file changed, 17 insertions(+), 16 deletions(-) commit 314f24fd0c8c6b024c93b1d8d275f9049ef22951 Author: Emmanuele Bassi @@ -5694,9 +6120,9 @@ Date: Fri Feb 29 16:00:55 2008 +0000 Rename all the API and the data types to the Json namespace, so we can use the internal copy instead of GScanner. - json-glib/json-scanner.c | 637 +++++++++++++++++++++++----------------------- + json-glib/json-scanner.c | 639 +++++++++++++++++++++++----------------------- json-glib/json-scanner.h | 6 +- - 2 files changed, 327 insertions(+), 316 deletions(-) + 2 files changed, 328 insertions(+), 317 deletions(-) commit 65708000ab02d0a4080b662bb409ac4b79101488 Author: Emmanuele Bassi @@ -5705,7 +6131,7 @@ Date: Fri Feb 29 16:00:30 2008 +0000 Add JsonScanner to the build json-glib/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit 8e27ac27a9b22361296564d740301c2c49b387f8 Author: Emmanuele Bassi @@ -5717,7 +6143,7 @@ Date: Fri Feb 29 15:59:57 2008 +0000 less ancient. configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit a475b0896d5760c893a099c9411f9790e5c492ba Author: Emmanuele Bassi @@ -5725,8 +6151,8 @@ Date: Fri Feb 29 12:24:14 2008 +0000 Update the JsonScanner default configuration - json-glib/json-scanner.c | 84 +++++++++++++++++++-------------------------- - 1 files changed, 36 insertions(+), 48 deletions(-) + json-glib/json-scanner.c | 84 ++++++++++++++++++++-------------------------- + 1 file changed, 36 insertions(+), 48 deletions(-) commit 10ac1734b326700257ef318d9a2000c538b5cd38 Author: Emmanuele Bassi @@ -5739,8 +6165,8 @@ Date: Fri Feb 29 12:22:02 2008 +0000 Also, remove the configuration: JsonScanner will provide us with one. - json-glib/json-parser.c | 127 ++++++++++++++++------------------------------ - 1 files changed, 44 insertions(+), 83 deletions(-) + json-glib/json-parser.c | 127 ++++++++++++++++------------------------------- + 1 file changed, 44 insertions(+), 83 deletions(-) commit 4a4095c360fc29f766e8baba3529a78b6d736b19 Author: Emmanuele Bassi @@ -5749,7 +6175,7 @@ Date: Fri Feb 29 12:21:20 2008 +0000 Add json-scanner.h to the exported headers json-glib/json-glib.h | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit 469a22e4f1fac6b4fd8110823322b7fbfa9b6552 Author: Emmanuele Bassi @@ -5758,7 +6184,7 @@ Date: Fri Feb 29 12:13:54 2008 +0000 Include JsonScanner into JsonParser json-glib/json-parser.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit 8537549a5a65f3111a4436b69499664c167b1534 Author: Emmanuele Bassi @@ -5769,7 +6195,7 @@ Date: Fri Feb 29 12:10:16 2008 +0000 The GTokenType extension enumeration belongs with the tokenizer. json-glib/json-parser.h | 15 ++------------- - 1 files changed, 2 insertions(+), 13 deletions(-) + 1 file changed, 2 insertions(+), 13 deletions(-) commit 1ddd45d36a3a25aa86a95c60e0c29e83687971bd Author: Emmanuele Bassi @@ -5790,7 +6216,7 @@ Date: Fri Feb 29 12:06:19 2008 +0000 json-glib/json-scanner.c | 1809 ++++++++++++++++++++++++++++++++++++++++++++++ json-glib/json-scanner.h | 167 +++++ - 2 files changed, 1976 insertions(+), 0 deletions(-) + 2 files changed, 1976 insertions(+) commit 3a9ec8f1ca9bf525875c3fbfaf1ab2f3c708bf36 Author: Emmanuele Bassi @@ -5811,7 +6237,7 @@ Date: Tue Jan 29 19:13:15 2008 +0000 contrib/json-glib-1.0.deps | 1 + contrib/json-glib-1.0.vapi | 14 +++++----- - contrib/json-test.vala | 62 +++++++++++++++++++++---------------------- + contrib/json-test.vala | 62 +++++++++++++++++++++----------------------- 3 files changed, 38 insertions(+), 39 deletions(-) commit e8a59f086f43e5abd5414033ea8c9a886eb112ed @@ -5824,7 +6250,7 @@ Date: Tue Jan 29 19:12:35 2008 +0000 lot about them. Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit b6963328f3d8d8e85ca0b21f9bdeca77b5611019 Author: Emmanuele Bassi @@ -5836,7 +6262,7 @@ Date: Tue Jan 29 18:19:16 2008 +0000 its symbol in the json-glib-sections.txt file anymore. doc/reference/json-glib-sections.txt | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + 1 file changed, 1 deletion(-) commit 48079c2f580171235eecc298b0193022a67e0b79 Author: Emmanuele Bassi @@ -5880,7 +6306,7 @@ Date: Mon Jan 28 11:02:30 2008 +0000 the correctly normalized one. json-glib/json-object.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit f2f08d282ac6bc69ba9029d065979b1332abd5a5 Author: Emmanuele Bassi @@ -5894,8 +6320,8 @@ Date: Sun Jan 27 21:26:51 2008 +0000 and dispose methods. As further optimisation, inlining them should be worth as well. - json-glib/json-parser.c | 51 +++++++++++++++++++++++++++------------------- - 1 files changed, 30 insertions(+), 21 deletions(-) + json-glib/json-parser.c | 51 ++++++++++++++++++++++++++++------------------- + 1 file changed, 30 insertions(+), 21 deletions(-) commit 629d4a54913c578d7b612f10d9b04addc8e0c7fb Author: Emmanuele Bassi @@ -5911,7 +6337,7 @@ Date: Tue Dec 25 21:44:03 2007 +0000 json-glib/json-gobject.c | 2 ++ json-glib/json-node.c | 3 +++ json-glib/json-object.c | 2 ++ - 5 files changed, 11 insertions(+), 0 deletions(-) + 5 files changed, 11 insertions(+) commit e172e9ccec88999e7d8433df08d8d92568537cf7 Author: Emmanuele Bassi @@ -5922,7 +6348,7 @@ Date: Tue Dec 25 21:41:44 2007 +0000 Use an intermediary pointer to avoid a lot of pointer dereferences json-glib/json-parser.c | 25 ++++++++++++++----------- - 1 files changed, 14 insertions(+), 11 deletions(-) + 1 file changed, 14 insertions(+), 11 deletions(-) commit 61a6a144a2182946be4fb975d05e1c26d814c323 Author: Emmanuele Bassi @@ -5937,7 +6363,7 @@ Date: Tue Dec 25 11:55:36 2007 +0000 support is ready, yet. contrib/json-glib-1.0.vapi | 21 ++++++++++-- - contrib/json-object.vala | 10 ++++- + contrib/json-object.vala | 10 ++++-- contrib/json-test.vala | 81 ++++++++++++++++++++++++++++++++------------ 3 files changed, 85 insertions(+), 27 deletions(-) @@ -5953,8 +6379,8 @@ Date: Tue Dec 25 11:53:04 2007 +0000 methods, and still be able to retain some basic functionality for the methods they decide not to implement. - json-glib/json-gobject.c | 208 ++++++++++++++++++++++++++------------------- - 1 files changed, 120 insertions(+), 88 deletions(-) + json-glib/json-gobject.c | 208 ++++++++++++++++++++++++++-------------------- + 1 file changed, 120 insertions(+), 88 deletions(-) commit 5bb6dd7b77dcd0d1996f484990223287d2144ff3 Author: Emmanuele Bassi @@ -5967,7 +6393,7 @@ Date: Tue Dec 25 11:51:20 2007 +0000 the passed JSON stream is a JavaScript assignment. json-glib/json-parser.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit a90a842f269314c4423de9d84d03391a8efbd7b5 Author: Emmanuele Bassi @@ -5993,7 +6419,7 @@ Date: Tue Dec 25 11:47:10 2007 +0000 Avoid feeding garbage to the callers by using g_slice_new0(). json-glib/json-node.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) + 1 file changed, 5 insertions(+), 4 deletions(-) commit ba7282dd23e2980203208cb73942535bfefa5906 Author: Emmanuele Bassi @@ -6004,7 +6430,7 @@ Date: Tue Dec 25 11:45:56 2007 +0000 Found this very dumb leak while using Valgrind. json-glib/json-generator.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + 1 file changed, 6 insertions(+) commit 193aca9aabbfc3db8e1faca0a65b19ac7ba96341 Author: Emmanuele Bassi @@ -6017,7 +6443,7 @@ Date: Tue Dec 25 11:44:18 2007 +0000 out. tests/test-07.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) + 1 file changed, 2 deletions(-) commit a6fae2d61b1cfefa742574761edc19c8d6f702f5 Author: Emmanuele Bassi @@ -6030,7 +6456,7 @@ Date: Thu Nov 22 16:00:35 2007 +0000 Vala to a JSON string. contrib/json-object.vala | 40 ++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 40 insertions(+), 0 deletions(-) + 1 file changed, 40 insertions(+) commit ea6cc8756f70d488eae128e4a01f63ce2766cc3a Author: Emmanuele Bassi @@ -6039,7 +6465,7 @@ Date: Thu Nov 22 15:59:25 2007 +0000 Omit the lenght argument now that we provide a default contrib/json-test.vala | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 9492f3439dd491bb5afadfe6b2bd49a72ec9bb1e Author: Emmanuele Bassi @@ -6055,7 +6481,7 @@ Date: Thu Nov 22 15:58:23 2007 +0000 * provide default values for the length argument in from_data()/to_data() contrib/json-glib-1.0.vapi | 20 +++++++++++--------- - 1 files changed, 11 insertions(+), 9 deletions(-) + 1 file changed, 11 insertions(+), 9 deletions(-) commit a255b4f5eb8769c444a9ac3a4cc7404fccd44ee3 Author: Emmanuele Bassi @@ -6069,7 +6495,7 @@ Date: Thu Nov 22 00:01:37 2007 +0000 Makefile.am | 8 +++++++- configure.ac | 3 +++ - 2 files changed, 10 insertions(+), 1 deletions(-) + 2 files changed, 10 insertions(+), 1 deletion(-) commit aa8911ca4d63bfb3dd34997f9a745d70d12673af Author: Emmanuele Bassi @@ -6078,7 +6504,7 @@ Date: Wed Nov 21 20:44:08 2007 +0000 Update the test case for the Vala bindings contrib/json-test.vala | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 7083e9e6733611b5313f0708c4b93b9726ef26d0 Author: Emmanuele Bassi @@ -6090,7 +6516,7 @@ Date: Wed Nov 21 20:43:35 2007 +0000 Also, export the JSON_NODE_TYPE() macro as Json.Node.type() method. contrib/json-glib-1.0.vapi | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) + 1 file changed, 6 insertions(+), 2 deletions(-) commit 9d4588e97a88960a4dd6a28debb3cb0f8d75f098 Author: Emmanuele Bassi @@ -6099,7 +6525,7 @@ Date: Wed Nov 21 20:42:07 2007 +0000 Add symbols of the newly committed API doc/reference/json-glib-sections.txt | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 file changed, 3 insertions(+) commit cf2eceeb69ccbda4f2ff583ee7869c7fd3cda603 Author: Emmanuele Bassi @@ -6114,7 +6540,7 @@ Date: Wed Nov 21 20:41:42 2007 +0000 json-glib/json-array.c | 29 +++++++++++++++++++++++++++++ json-glib/json-object.c | 29 +++++++++++++++++++++++++++++ json-glib/json-types.h | 4 ++++ - 3 files changed, 62 insertions(+), 0 deletions(-) + 3 files changed, 62 insertions(+) commit 5a4a8761af0562fbee8e1a56ce1771a20c1ad8e3 Author: Emmanuele Bassi @@ -6130,7 +6556,7 @@ Date: Wed Nov 21 20:07:12 2007 +0000 tests/test-03.c | 2 ++ tests/test-04.c | 8 ++++++++ tests/test-05.c | 6 ++++++ - 5 files changed, 19 insertions(+), 1 deletions(-) + 5 files changed, 19 insertions(+), 1 deletion(-) commit ac699263493e09eeb203f9bf88c0a8296f9e4a8f Author: Emmanuele Bassi @@ -6142,7 +6568,7 @@ Date: Wed Nov 21 20:06:06 2007 +0000 root node getter function of JsonParser. json-glib/json-gobject.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit 0b6b09c0fe2fdd21b18593192e7213d1b0098f12 Author: Emmanuele Bassi @@ -6178,7 +6604,7 @@ Date: Wed Nov 21 18:39:04 2007 +0000 contrib/Makefile.am | 4 ++ contrib/json-glib-1.0.vapi | 118 ++++++++++++++++++++++++++++++++++++++++++++ contrib/json-test.vala | 87 ++++++++++++++++++++++++++++++++ - 5 files changed, 222 insertions(+), 1 deletions(-) + 5 files changed, 222 insertions(+), 1 deletion(-) commit 557a60b4e0f1fd6fc0fa79efc60f9bfd777e0670 Author: Emmanuele Bassi @@ -6202,8 +6628,8 @@ Date: Wed Nov 21 01:39:00 2007 +0000 The JsonGenerator:indent-char can be used to control the character that indents the lines when pretty printing. - json-glib/json-generator.c | 54 ++++++++++++++++++++++++++++++++----------- - 1 files changed, 40 insertions(+), 14 deletions(-) + json-glib/json-generator.c | 54 ++++++++++++++++++++++++++++++++------------ + 1 file changed, 40 insertions(+), 14 deletions(-) commit 58133b51152ca76b8cb5c93b5991f9b1a565e9a9 Author: Emmanuele Bassi @@ -6215,7 +6641,7 @@ Date: Wed Nov 21 01:20:20 2007 +0000 and not G_TYPE_FLOAT anymore. json-glib/json-generator.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 80006db7bcea2bd8c44a648a64ba3da6a05a6fd1 Author: Emmanuele Bassi @@ -6226,8 +6652,8 @@ Date: Tue Nov 20 18:30:42 2007 +0000 Update the GObject deserialization test suite to check for the correct deserialization of the enum/flags values. - tests/test-08.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++------ - 1 files changed, 53 insertions(+), 7 deletions(-) + tests/test-08.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 53 insertions(+), 7 deletions(-) commit 1110e098fa879abf7f67f24af2a1b736ce359dd6 Author: Emmanuele Bassi @@ -6242,7 +6668,7 @@ Date: Tue Nov 20 18:20:33 2007 +0000 This code is taken from ClutterScript and it was adapted from GtkBuilder. json-glib/json-gobject.c | 170 ++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 170 insertions(+), 0 deletions(-) + 1 file changed, 170 insertions(+) commit 2674ce68e574cebeca147944cf748b41fbe27507 Author: Emmanuele Bassi @@ -6251,7 +6677,7 @@ Date: Tue Nov 13 11:34:05 2007 +0000 Bump up to 0.5.0 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit c1547eb3aba6f09b3ce4c23bd66a798e03b35a34 Author: Emmanuele Bassi @@ -6261,7 +6687,7 @@ Date: Tue Nov 13 11:29:19 2007 +0000 NEWS | 9 +++++++++ configure.ac | 2 +- - 2 files changed, 10 insertions(+), 1 deletions(-) + 2 files changed, 10 insertions(+), 1 deletion(-) commit 03325e108e40d5deba979852ee402d7d6579ac81 Author: Emmanuele Bassi @@ -6270,7 +6696,7 @@ Date: Tue Nov 13 11:20:34 2007 +0000 Fix variable shadowing for distcheck json-glib/json-parser.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit afeec9b40468d289351c78007b5122ff716bb977 Author: Emmanuele Bassi @@ -6279,7 +6705,7 @@ Date: Tue Nov 13 11:16:51 2007 +0000 Add 0.4 symbols index doc/reference/json-glib-docs.sgml | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + 1 file changed, 4 insertions(+) commit 32023e03ca9c976e66b9af949d4aea36e1d4d874 Author: Emmanuele Bassi @@ -6291,7 +6717,7 @@ Date: Tue Nov 13 10:59:14 2007 +0000 a property into a JSON object member and vice versa. json-glib/json-gobject.c | 15 ++++++++------- - 1 files changed, 8 insertions(+), 7 deletions(-) + 1 file changed, 8 insertions(+), 7 deletions(-) commit c669a28d37795be68f3a51e9353f6f9d8e695a52 Author: Emmanuele Bassi @@ -6300,7 +6726,7 @@ Date: Tue Nov 13 10:55:23 2007 +0000 Add new symbols to the documentation doc/reference/json-glib-sections.txt | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) + 1 file changed, 6 insertions(+), 1 deletion(-) commit b83a2bfa96885837ca48bacb6492fd68a2b5b564 Merge: 1f9b3e5 198ed83 @@ -6333,7 +6759,7 @@ Date: Tue Nov 13 10:46:02 2007 +0000 .gitignore | 2 + tests/Makefile.am | 4 +- tests/test-08.c | 291 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 296 insertions(+), 1 deletions(-) + 3 files changed, 296 insertions(+), 1 deletion(-) commit 7b93db7ad996b29a6c576db33803029dc94e16fc Author: Emmanuele Bassi @@ -6346,7 +6772,7 @@ Date: Tue Nov 13 10:45:23 2007 +0000 way around. json-glib/json-gobject.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) + 1 file changed, 4 insertions(+), 2 deletions(-) commit 9e61004365982017bfe9b76889e2a7d1a0320350 Author: Emmanuele Bassi @@ -6355,7 +6781,7 @@ Date: Tue Nov 13 10:11:34 2007 +0000 Update git ignore file .gitignore | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit 4b496c7d906c81dceafe6a5f442b55b6e161f762 Author: Emmanuele Bassi @@ -6370,8 +6796,8 @@ Date: Tue Nov 13 10:11:00 2007 +0000 It will natively convert integers, booleans, strings and double precision floating point values; it also handles string vectors in form of arrays. - json-glib/json-gobject.c | 94 +++++++++++++++++++++++++++++++++++++++++---- - 1 files changed, 85 insertions(+), 9 deletions(-) + json-glib/json-gobject.c | 94 +++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 85 insertions(+), 9 deletions(-) commit a7c39c910e08093ee0d0723685005623f26b9eae Author: Emmanuele Bassi @@ -6394,7 +6820,7 @@ Date: Tue Nov 13 09:28:57 2007 +0000 feeding it to the JsonGenerator. json-glib/json-generator.c | 30 ++++++++++++++++++++++++++++-- - 1 files changed, 28 insertions(+), 2 deletions(-) + 1 file changed, 28 insertions(+), 2 deletions(-) commit 6132d7325c33e26740b4c955d8ccbe53fd817cd8 Author: Emmanuele Bassi @@ -6405,7 +6831,7 @@ Date: Tue Nov 13 09:26:02 2007 +0000 JsonNode payload is inside a union. json-glib/json-node.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit f051b948714e4928a7d7f903e891639ce4ba82fd Author: Emmanuele Bassi @@ -6433,7 +6859,7 @@ Date: Sat Nov 10 15:12:20 2007 +0000 json-glib/json-parser.c | 12 +++++++++++- tests/test-02.c | 1 + - 2 files changed, 12 insertions(+), 1 deletions(-) + 2 files changed, 12 insertions(+), 1 deletion(-) commit 261d05a4cdcc1f64824615cdc81b4b467d0a5f57 Author: Emmanuele Bassi @@ -6458,8 +6884,8 @@ Date: Sat Nov 10 02:15:44 2007 +0000 doc/reference/json-glib-sections.txt | 1 + json-glib/json-parser.c | 80 +++++++++++++++++++++++++++++++++- - json-glib/json-parser.h | 5 ++ - tests/test-02.c | 5 ++ + json-glib/json-parser.h | 5 +++ + tests/test-02.c | 5 +++ 4 files changed, 89 insertions(+), 2 deletions(-) commit 45c697263364a975fd6a54373f999f2932436b6f @@ -6488,7 +6914,7 @@ Date: Mon Oct 29 22:23:36 2007 +0000 Fix objects test suite to match the arrays one tests/test-03.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 file changed, 4 insertions(+), 4 deletions(-) commit 3948d83795d68d665b8b969c08b6c40498eb2661 Author: Emmanuele Bassi @@ -6499,7 +6925,7 @@ Date: Mon Oct 29 22:23:07 2007 +0000 Add a check for commas after complex data types inside object members. json-glib/json-parser.c | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) + 1 file changed, 7 insertions(+), 1 deletion(-) commit 6182457fa305a1f159e9009d3fbef42a93f2768e Author: Emmanuele Bassi @@ -6511,7 +6937,7 @@ Date: Mon Oct 29 22:17:44 2007 +0000 use G_TYPE_DOUBLE instead of G_TYPE_FLOAT for the floating point values. tests/test-02.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 file changed, 4 insertions(+), 4 deletions(-) commit 25cdc18be8acdad54561f919c5805ad4fa9b3ac9 Author: Emmanuele Bassi @@ -6522,7 +6948,7 @@ Date: Mon Oct 29 22:16:31 2007 +0000 Catch missing commas after an array element or an object member. json-glib/json-parser.c | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) + 1 file changed, 10 insertions(+) commit 812422e4ed4df83374cdda6d94637448ab94dfef Author: Emmanuele Bassi @@ -6539,7 +6965,7 @@ Date: Mon Oct 29 18:18:34 2007 +0000 which should make the JsonParser hopefully complete. json-glib/json-parser.c | 123 +++++++++++++++++++++++++++++++++++++++-------- - 1 files changed, 103 insertions(+), 20 deletions(-) + 1 file changed, 103 insertions(+), 20 deletions(-) commit 72d007d865a822875dfa311698fb2d13f5d3df69 Author: Emmanuele Bassi @@ -6551,7 +6977,7 @@ Date: Mon Oct 29 18:16:24 2007 +0000 we need to check if the payload of JsonNode is set to avoid a critical. json-glib/json-node.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) + 1 file changed, 4 insertions(+), 2 deletions(-) commit 59a66484befba457eda2ee7a9540f2b33ff04031 Author: Emmanuele Bassi @@ -6564,7 +6990,7 @@ Date: Tue Oct 16 23:20:22 2007 +0100 tests/Makefile.am | 4 +- tests/test-07.c | 265 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 268 insertions(+), 1 deletions(-) + 2 files changed, 268 insertions(+), 1 deletion(-) commit 34515af7bb1d69317b9e52d0ced92beaf6770e7d Author: Emmanuele Bassi @@ -6575,7 +7001,7 @@ Date: Tue Oct 16 23:19:35 2007 +0100 A placeholder, while syntactically correct, won't do. json-glib/json-gobject.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + 1 file changed, 6 insertions(+) commit 0656c4bee8e14c375481c89a62f0e6e95be758ce Author: Emmanuele Bassi @@ -6587,7 +7013,7 @@ Date: Tue Oct 16 23:18:47 2007 +0100 variable and you don't run the test suite to check the results. json-glib/json-generator.c | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) + 1 file changed, 6 insertions(+), 4 deletions(-) commit 88794df33e08cb409f71d1aaf702cd509b600954 Author: Emmanuele Bassi @@ -6596,7 +7022,7 @@ Date: Tue Oct 16 19:53:27 2007 +0100 Bump up to 0.3.0 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 0ce3bf30d84aedcf5f8f75e6c1112d91dcc1d654 Author: Emmanuele Bassi @@ -6605,7 +7031,7 @@ Date: Tue Oct 16 19:49:42 2007 +0100 Bump up to 0.2.0 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 77248800533f3dabfb09dfa8ba32e3084ea62d5f Author: Emmanuele Bassi @@ -6614,7 +7040,7 @@ Date: Tue Oct 16 19:43:27 2007 +0100 Fix DISTCHECK configure flags Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 70be36c97a8cd598af061eb9ac5a9a5852858682 Author: Emmanuele Bassi @@ -6636,7 +7062,7 @@ Date: Tue Oct 16 19:41:18 2007 +0100 Some autogenerated code caused -Werror to croak, so -Wextra has to go. configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 9c690da734ee4513f19841f93a08ae35bbaa65b1 Author: Emmanuele Bassi @@ -6645,7 +7071,7 @@ Date: Tue Oct 16 18:20:19 2007 +0100 Autogenerate the ChangeLog when disting Makefile.am | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + 1 file changed, 5 insertions(+) commit 95fc9c4fb5af82c766d2f4f515b361028bc348e7 Author: Emmanuele Bassi @@ -6654,7 +7080,7 @@ Date: Tue Oct 16 18:20:01 2007 +0100 Fix EXTRA_DIST files for distcheck json-glib/Makefile.am | 16 +++++++++------- - 1 files changed, 9 insertions(+), 7 deletions(-) + 1 file changed, 9 insertions(+), 7 deletions(-) commit 87a36b8a5e23f3cf80730627f9b89061934a5bbf Author: Emmanuele Bassi @@ -6685,7 +7111,7 @@ Date: Tue Oct 16 17:25:08 2007 +0100 doc/reference/json-glib-sections.txt | 1 + json-glib/json-object.c | 41 ++++++++++++++++++++++++++++++++++ json-glib/json-types.h | 1 + - 3 files changed, 43 insertions(+), 0 deletions(-) + 3 files changed, 43 insertions(+) commit 474ecf1cc6aae35b184edffc75fc8626c3f12f61 Author: Emmanuele Bassi @@ -6694,7 +7120,7 @@ Date: Tue Oct 16 16:40:57 2007 +0100 Add a note in the JsonObject documentation for the member name normalization json-glib/json-object.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) + 1 file changed, 5 insertions(+), 1 deletion(-) commit 93e26b94d9bb1909f3b16a4b0500f27660d7e621 Author: Emmanuele Bassi @@ -6710,7 +7136,7 @@ Date: Tue Oct 16 16:37:01 2007 +0100 for a JsonObject. json-glib/json-object.c | 31 ++++++++++++++++++++++++++----- - 1 files changed, 26 insertions(+), 5 deletions(-) + 1 file changed, 26 insertions(+), 5 deletions(-) commit 73a7671dedfd3bb9bc1a8c197a68dcef90e627f7 Author: Emmanuele Bassi @@ -6725,7 +7151,7 @@ Date: Mon Oct 15 10:28:39 2007 +0100 configure.ac | 2 +- json-glib/json-object.c | 25 +++++++++++++++++++++++++ - 2 files changed, 26 insertions(+), 1 deletions(-) + 2 files changed, 26 insertions(+), 1 deletion(-) commit 28928a2f1cbe83a2f1bf699c915daa6eca80f587 Author: Emmanuele Bassi @@ -6741,8 +7167,8 @@ Date: Mon Oct 15 10:25:09 2007 +0100 doc/reference/json-glib-sections.txt | 2 + json-glib/json-array.c | 18 +++++ json-glib/json-object.c | 17 +++++ - json-glib/json-types.h | 120 +++++++++++++++++---------------- - 4 files changed, 99 insertions(+), 58 deletions(-) + json-glib/json-types.h | 126 ++++++++++++++++++---------------- + 4 files changed, 102 insertions(+), 61 deletions(-) commit b3ecd6e2fbdd58250427f406c43d60b8cb8d2644 Author: Emmanuele Bassi @@ -6756,8 +7182,8 @@ Date: Wed Oct 10 12:03:59 2007 +0100 Also, use the commodity JsonNode API to avoid using values in the parser code. - json-glib/json-parser.c | 79 +++++++++++++++++----------------------------- - 1 files changed, 29 insertions(+), 50 deletions(-) + json-glib/json-parser.c | 79 +++++++++++++++++------------------------------ + 1 file changed, 29 insertions(+), 50 deletions(-) commit a7839a06da53d32eb372b4813e5883a04e1c36b7 Author: Emmanuele Bassi @@ -6766,7 +7192,7 @@ Date: Tue Oct 9 20:52:56 2007 +0100 Add the forgotten JsonGenerator type function doc/reference/json-glib.types | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit daeef3345c3a7f3325cea8c945f0e1d814defcc1 Author: Emmanuele Bassi @@ -6780,7 +7206,7 @@ Date: Mon Oct 8 18:29:44 2007 +0100 doc/reference/json-glib-sections.txt | 1 + json-glib/json-node.c | 20 ++++++++++++++++++++ json-glib/json-types.h | 1 + - 3 files changed, 22 insertions(+), 0 deletions(-) + 3 files changed, 22 insertions(+) commit b12efcec57fff6e7637fc924fc50333b97eb2594 Author: Emmanuele Bassi @@ -6808,7 +7234,7 @@ Date: Fri Oct 5 18:24:27 2007 +0100 doc/reference/json-glib-sections.txt | 8 ++ json-glib/json-node.c | 201 ++++++++++++++++++++++++++++++++++ json-glib/json-types.h | 12 ++ - 3 files changed, 221 insertions(+), 0 deletions(-) + 3 files changed, 221 insertions(+) commit ad95c8bf8e4103058d42ae71f47e6980e3b52c34 Author: Emmanuele Bassi @@ -6821,7 +7247,7 @@ Date: Fri Oct 5 18:23:15 2007 +0100 parsed constants into a GValue. json-glib/json-parser.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 file changed, 4 insertions(+), 4 deletions(-) commit 220838e4e61c5a8fd9cf627da7309acf44fa82f0 Author: Emmanuele Bassi @@ -6833,9 +7259,9 @@ Date: Fri Oct 5 16:39:10 2007 +0100 and position within that line. These methods works only while parsing, so within the signal handlers and inside subclasses. - doc/reference/json-glib-sections.txt | 6 ++++ - json-glib/json-parser.c | 46 +++++++++++++++++++++++++++++++-- - json-glib/json-parser.h | 21 +++++++++------ + doc/reference/json-glib-sections.txt | 6 +++++ + json-glib/json-parser.c | 46 +++++++++++++++++++++++++++++++--- + json-glib/json-parser.h | 21 +++++++++------- 3 files changed, 61 insertions(+), 12 deletions(-) commit ea5ee264a5b82fd1d09fa84ec81e17c4ea0d0c4a @@ -6845,8 +7271,8 @@ Date: Fri Oct 5 15:13:21 2007 +0100 Document the newly added signals json-glib/json-parser.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++ - json-glib/json-parser.h | 10 ++++++- - 2 files changed, 73 insertions(+), 1 deletions(-) + json-glib/json-parser.h | 10 +++++++- + 2 files changed, 73 insertions(+), 1 deletion(-) commit fa9d1676da588306be5a14bcab100ad58a41b799 Author: Emmanuele Bassi @@ -6860,8 +7286,8 @@ Date: Fri Oct 5 11:59:44 2007 +0100 These signals require the addition of some custom marshaller. json-glib/json-marshal.list | 4 ++ - json-glib/json-parser.c | 118 +++++++++++++++++++++++++++++++++++++++++- - json-glib/json-parser.h | 25 ++++++++- + json-glib/json-parser.c | 118 +++++++++++++++++++++++++++++++++++++++++-- + json-glib/json-parser.h | 25 +++++++-- 3 files changed, 141 insertions(+), 6 deletions(-) commit aa2b31234f7cfac63b870e8d9d74e682b3121d4a @@ -6891,7 +7317,7 @@ Date: Tue Oct 2 12:13:23 2007 +0100 doc/reference/json-glib-docs.sgml | 6 ++++++ doc/reference/json-glib-sections.txt | 6 ++++++ - 2 files changed, 12 insertions(+), 0 deletions(-) + 2 files changed, 12 insertions(+) commit cea3f69f2cde1cb4e6ea9242f6014b31864ad80f Author: Emmanuele Bassi @@ -6902,7 +7328,7 @@ Date: Tue Oct 2 12:12:49 2007 +0100 .gitignore | 2 + tests/Makefile.am | 4 +- tests/test-06.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 159 insertions(+), 1 deletions(-) + 3 files changed, 159 insertions(+), 1 deletion(-) commit 3666613e47b66d67a28bc06c6dcf678fe97eae50 Author: Emmanuele Bassi @@ -6917,7 +7343,7 @@ Date: Tue Oct 2 12:11:55 2007 +0100 json-glib/Makefile.am | 2 + json-glib/json-gobject.c | 169 ++++++++++++++++++++++++++++++++++++++++++++++ json-glib/json-gobject.h | 33 +++++++++ - 4 files changed, 205 insertions(+), 0 deletions(-) + 4 files changed, 205 insertions(+) commit 8398253c76cf5dda23891b49b1aaa49e57d95a8d Author: Emmanuele Bassi @@ -6935,7 +7361,7 @@ Date: Tue Oct 2 10:03:00 2007 +0100 .gitignore | 2 + tests/Makefile.am | 4 +- tests/test-05.c | 217 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 222 insertions(+), 1 deletions(-) + 3 files changed, 222 insertions(+), 1 deletion(-) commit 2b25dbfa802f9af6e76fbe72140b687535cae8e5 Author: Emmanuele Bassi @@ -6946,7 +7372,7 @@ Date: Tue Oct 2 08:07:56 2007 +0100 JsonGenerator can now create objects and array-nested objects, with and without pretty printing. The test suite has been updated accordingly. - json-glib/json-generator.c | 125 ++++++++++++++++++++++++++++++++++++++++++- + json-glib/json-generator.c | 125 ++++++++++++++++++++++++++++++++++++++++++-- tests/test-04.c | 68 ++++++++++++++++++++++++ 2 files changed, 190 insertions(+), 3 deletions(-) @@ -6959,9 +7385,9 @@ Date: Mon Oct 1 23:07:18 2007 +0100 JsonGenerator now supports nested arrays, both with and without pretty printing. The tests suite has been updated accordingly. - json-glib/json-generator.c | 10 +++++++ + json-glib/json-generator.c | 10 ++++++++ tests/test-04.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 71 insertions(+), 0 deletions(-) + 2 files changed, 71 insertions(+) commit 6f4dd6b154a150e8b4221800b61f85e5c4277d1b Author: Emmanuele Bassi @@ -6985,7 +7411,7 @@ Date: Mon Oct 1 22:22:12 2007 +0100 Update list of git ignored files .gitignore | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + 1 file changed, 5 insertions(+) commit 47b34271f989cb5f2ba01a633d003adb6052cbd1 Author: Emmanuele Bassi @@ -6995,7 +7421,7 @@ Date: Mon Oct 1 22:20:23 2007 +0100 tests/Makefile.am | 4 +++- tests/test-04.c | 29 +++++++++++++++++++++++++++++ - 2 files changed, 32 insertions(+), 1 deletions(-) + 2 files changed, 32 insertions(+), 1 deletion(-) commit 8edb4ef3232428ac9e548ae6c1dfa2328bf7198c Author: Emmanuele Bassi @@ -7004,7 +7430,7 @@ Date: Mon Oct 1 22:19:28 2007 +0100 Add missing json-generator.h header json-glib/json-glib.h | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit f09acae8e0d6ceba5d13de75551491835a7e71de Author: Emmanuele Bassi @@ -7015,7 +7441,7 @@ Date: Mon Oct 1 19:49:43 2007 +0100 Now that we moved the constructors and setters for the JSON data types into the public symbols we need to document them to get back to 100% doc coverage. - doc/reference/json-glib-sections.txt | 26 ++++++++++- + doc/reference/json-glib-sections.txt | 26 +++++++++++- json-glib/json-array.c | 22 ++++++++++ json-glib/json-node.c | 78 ++++++++++++++++++++++++++++++++++ json-glib/json-object.c | 15 +++++++ @@ -7040,8 +7466,8 @@ Date: Mon Oct 1 18:01:20 2007 +0100 json-glib/json-object.c | 1 - json-glib/json-parser.c | 1 - json-glib/json-private.h | 35 ----------------------------------- - json-glib/json-types.h | 36 ++++++++++++++++++++++++++++++------ - 8 files changed, 31 insertions(+), 47 deletions(-) + json-glib/json-types.h | 38 +++++++++++++++++++++++++++++++------- + 8 files changed, 32 insertions(+), 48 deletions(-) commit bfa60e9ef9da71e3c0d171f81cd08e8eac749061 Author: Emmanuele Bassi @@ -7058,7 +7484,7 @@ Date: Mon Oct 1 17:48:34 2007 +0100 json-glib/Makefile.am | 2 + json-glib/json-generator.c | 255 ++++++++++++++++++++++++++++++++++ json-glib/json-generator.h | 82 +++++++++++ - 5 files changed, 365 insertions(+), 0 deletions(-) + 5 files changed, 365 insertions(+) commit 41849494890f1f51bc7c4429f0ee7b5d168da302 Author: Emmanuele Bassi @@ -7067,7 +7493,7 @@ Date: Mon Oct 1 16:37:14 2007 +0100 Fix ids inside the main documentation index doc/reference/json-glib-docs.sgml | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit c3f8ea960ef7f8733969d9fb0f71531bc7449a16 Author: Emmanuele Bassi @@ -7079,7 +7505,7 @@ Date: Mon Oct 1 16:25:47 2007 +0100 json-glib/json-parser.h | 19 +++++++++++++++++++ json-glib/json-types.h | 20 ++++++++++++++++++++ - 2 files changed, 39 insertions(+), 0 deletions(-) + 2 files changed, 39 insertions(+) commit 2211e4e60b90b92d868c9b5f6b61e133d2435b4d Author: Emmanuele Bassi @@ -7091,7 +7517,7 @@ Date: Mon Oct 1 16:25:11 2007 +0100 the declared json_node_get_parent() function. json-glib/json-node.c | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) + 1 file changed, 16 insertions(+) commit 29feafc236f888021b817fdfe0cfe685f5e3b65e Author: Emmanuele Bassi @@ -7100,12 +7526,12 @@ Date: Mon Oct 1 16:16:15 2007 +0100 Add licensing informations to the source code json-glib/json-array.c | 29 ++++++++++++++++++++++++ - json-glib/json-node.c | 52 ++++++++++++++++++++++++++++++++++++------ - json-glib/json-object.c | 34 ++++++++++++++++++++++++--- - json-glib/json-parser.c | 28 +++++++++++++++++++++- - json-glib/json-parser.h | 19 +++++++++++++++ + json-glib/json-node.c | 52 ++++++++++++++++++++++++++++++++++++------- + json-glib/json-object.c | 34 ++++++++++++++++++++++++---- + json-glib/json-parser.c | 28 +++++++++++++++++++++-- + json-glib/json-parser.h | 19 ++++++++++++++++ json-glib/json-types.h | 35 +++++++++++++++++++++++++++++ - json-glib/json-version.h.in | 19 +++++++++++++++ + json-glib/json-version.h.in | 19 ++++++++++++++++ 7 files changed, 202 insertions(+), 14 deletions(-) commit 6eb1a5e94957d3555e7de5f6744a8777cd89efaf @@ -7115,7 +7541,7 @@ Date: Mon Oct 1 15:55:04 2007 +0100 Fix a stray newline in the documentation doc/reference/json-glib-docs.sgml | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) + 1 file changed, 1 insertion(+), 2 deletions(-) commit a5ecf553082816a1ce6c4354ff23e8addf8d9c80 Author: Emmanuele Bassi @@ -7124,7 +7550,7 @@ Date: Mon Oct 1 15:52:54 2007 +0100 Update git ignore file .gitignore | 22 ++++++++++++++++++++++ - 1 files changed, 22 insertions(+), 0 deletions(-) + 1 file changed, 22 insertions(+) commit 9bdee4c01adef7e9d7ed18d5dd94671057f1459b Author: Emmanuele Bassi @@ -7151,7 +7577,7 @@ Date: Mon Oct 1 14:57:39 2007 +0100 Add more test cases for the object parsing tests/test-03.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 file changed, 3 insertions(+) commit 79423943a8588a8ed6d5bedbc038255111897261 Author: Emmanuele Bassi @@ -7163,7 +7589,7 @@ Date: Mon Oct 1 14:57:25 2007 +0100 swallowed by the parser as soon as possible. json-glib/json-parser.c | 25 ++++++++++++++++--------- - 1 files changed, 16 insertions(+), 9 deletions(-) + 1 file changed, 16 insertions(+), 9 deletions(-) commit e711b883dba88d68b6986d87f14a06361cf54be7 Author: Emmanuele Bassi @@ -7172,7 +7598,7 @@ Date: Mon Oct 1 14:46:31 2007 +0100 Update gitignore .gitignore | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 file changed, 3 insertions(+) commit 591989c80b16fe68bdd79bcc7759a4249fdaf129 Author: Emmanuele Bassi @@ -7198,7 +7624,7 @@ Date: Mon Oct 1 14:44:51 2007 +0100 a JSON parser. json-glib/json-parser.c | 235 ++++++++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 220 insertions(+), 15 deletions(-) + 1 file changed, 220 insertions(+), 15 deletions(-) commit fd89ad3d7127e68df06345fa52863e73ada93689 Author: Emmanuele Bassi @@ -7212,7 +7638,7 @@ Date: Mon Oct 1 14:43:12 2007 +0100 setting them into the JsonNodes. json-glib/json-private.h | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + 1 file changed, 4 insertions(+) commit b2ee98f9b0baac019540020e177189b6a3780b83 Author: Emmanuele Bassi @@ -7224,7 +7650,7 @@ Date: Mon Oct 1 13:01:32 2007 +0100 of the newly created ones. json-glib/json-parser.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) + 1 file changed, 5 insertions(+), 1 deletion(-) commit 88b11be5eec1da769328e93189bc2f3316c9cd0a Author: Emmanuele Bassi @@ -7251,14 +7677,14 @@ Date: Mon Oct 1 12:57:46 2007 +0100 json-glib/json-array.c | 64 +++++------ json-glib/json-data.c | 93 ---------------- json-glib/json-node.c | 269 ++++++++++++++++++++++++++++++++++++++++++++++ - json-glib/json-object.c | 44 ++------ + json-glib/json-object.c | 44 +++----- json-glib/json-parser.c | 87 +++++++++++---- json-glib/json-parser.h | 2 +- - json-glib/json-private.h | 38 +++---- - json-glib/json-types.h | 55 ++++++---- + json-glib/json-private.h | 38 ++++--- + json-glib/json-types.h | 59 +++++----- tests/test-01.c | 2 +- tests/test-02.c | 112 ++++++++++++++++++- - 11 files changed, 533 insertions(+), 235 deletions(-) + 11 files changed, 535 insertions(+), 237 deletions(-) commit c11ebd32f73a1e21d6097bf9eba8e12f7e35497a Author: Emmanuele Bassi @@ -7273,9 +7699,9 @@ Date: Fri Sep 21 21:07:12 2007 +0100 json-glib/Makefile.am | 1 + json-glib/json-data.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++ - json-glib/json-private.h | 7 +++ - json-glib/json-types.h | 49 +++++++++++++++++------- - 4 files changed, 136 insertions(+), 14 deletions(-) + json-glib/json-private.h | 7 ++++ + json-glib/json-types.h | 53 ++++++++++++++++++-------- + 4 files changed, 138 insertions(+), 16 deletions(-) commit f661c7e1a04c2fb198279030c9dd812f357240a3 Author: Emmanuele Bassi @@ -7288,7 +7714,7 @@ Date: Fri Sep 21 21:05:12 2007 +0100 after we have finished parsing a nested array. json-glib/json-parser.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit ae3a66e6a90b6cfd71cb8c41c0d752fd1b0a67cc Author: Emmanuele Bassi @@ -7297,7 +7723,7 @@ Date: Fri Sep 21 20:15:52 2007 +0100 Update gitignore file .gitignore | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + 1 file changed, 7 insertions(+) commit 7875c5f573fdc6c2a39e958d2032f4c26d1f91ff Author: Emmanuele Bassi @@ -7317,7 +7743,7 @@ Date: Fri Sep 21 20:14:49 2007 +0100 tests/Makefile.am | 12 ++++++++++++ tests/test-01.c | 31 +++++++++++++++++++++++++++++++ tests/test-02.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 95 insertions(+), 0 deletions(-) + 3 files changed, 95 insertions(+) commit 81ad2e5c61db2391d2d98a6b5df1247e3abf16ec Author: Emmanuele Bassi @@ -7331,7 +7757,7 @@ Date: Fri Sep 21 20:12:02 2007 +0100 pass at the problem. json-glib/json-parser.c | 114 ++++++++++++++++++++++++++++++++++++++++------- - 1 files changed, 97 insertions(+), 17 deletions(-) + 1 file changed, 97 insertions(+), 17 deletions(-) commit b433703db6722785e33f968830e23c5806230ac2 Author: Emmanuele Bassi @@ -7340,7 +7766,7 @@ Date: Fri Sep 21 12:16:15 2007 +0100 Add RFC 4627 text, where JSON is defined doc/rfc4627.txt | 563 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 563 insertions(+), 0 deletions(-) + 1 file changed, 563 insertions(+) commit c77af0ec13e3e11cdb784510e6a75125bb8ef667 Author: Emmanuele Bassi @@ -7352,7 +7778,7 @@ Date: Fri Sep 21 12:08:09 2007 +0100 only express objects and/or arrays as top-levels. json-glib/json-parser.c | 24 ++++++++++++++---------- - 1 files changed, 14 insertions(+), 10 deletions(-) + 1 file changed, 14 insertions(+), 10 deletions(-) commit 0ff67fb63c5e021b88d6a3d17c5e34dc95ac2676 Author: Emmanuele Bassi @@ -7361,7 +7787,7 @@ Date: Fri Sep 21 11:58:00 2007 +0100 Update gitignore file .gitignore | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + 1 file changed, 4 insertions(+) commit d98d8c3d245192abe6ec5a531c9d0d678b07d061 Author: Emmanuele Bassi @@ -7385,7 +7811,7 @@ Date: Fri Sep 21 11:54:40 2007 +0100 GScanner should really get a way to retrieve the last error message. json-glib/json-parser.c | 266 ++++++++++++++++++++++++++++++++++++++++++++++- - json-glib/json-parser.h | 28 +++++- + json-glib/json-parser.h | 28 ++++- 2 files changed, 290 insertions(+), 4 deletions(-) commit cd1040e2fb6f6da50aaf72017746b33234c39704 @@ -7408,7 +7834,7 @@ Date: Thu Sep 20 20:41:09 2007 +0100 Add gitignore file .gitignore | 29 +++++++++++++++++++++++++++++ - 1 files changed, 29 insertions(+), 0 deletions(-) + 1 file changed, 29 insertions(+) commit c5bfb22f964b8f1feecdc8fb29d8a74b36861d32 Author: Emmanuele Bassi @@ -7440,4 +7866,4 @@ Date: Thu Sep 20 17:33:28 2007 +0100 json-glib/json-private.h | 26 +++ json-glib/json-types.h | 32 +++ json-glib/json-version.h.in | 65 ++++++ - 19 files changed, 1551 insertions(+), 0 deletions(-) + 19 files changed, 1551 insertions(+) diff --git a/Makefile.am b/Makefile.am index d0a944d..3b9edab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,5 +31,27 @@ dist-hook: echo A git checkout is required to generate a ChangeLog >&2; \ fi -gcov: - ( cd json-glib && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? +if ENABLE_GCOV +# use recursive makes in order to ignore errors during check/perf +lcov: + -$(MAKE) $(AM_MAKEFLAGS) check + $(MAKE) $(AM_MAKEFLAGS) genlcov + +# we have to massage the lcov.info file slightly to hide the effect of libtool +# placing the objects files in the .libs/ directory separate from the *.c +genlcov: + $(LTP) --directory $(top_builddir) --capture --output-file json-lcov.info --test-name JSON_TEST --no-checksum + $(SED) -e 's#.libs/##' < json-lcov.info > json-lcov.info.tmp + LANG=C $(LTP_GENHTML) --prefix $(top_builddir) --output-directory json-lcov --title "JSON-GLib Code Coverage" --show-details json-lcov.info.tmp + rm -f json-lcov.info.tmp + +lcov-clean: + -$(LTP) --directory $(top_builddir) -z + -$(RM) -rf json-lcov.info json-lcov +else +lcov genlcov lcov-clean: + @echo You need to configure JSON-GLib with support for gcov enabled. + @echo e.g., ./configure --enable-gcov +endif + +.PHONY: lcov genlcov lcov-clean diff --git a/Makefile.in b/Makefile.in index a47204e..3b59fa8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -38,7 +38,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ +DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/json-glib.pc.in \ $(top_srcdir)/build/autotools/Makefile.am.gtest \ @@ -74,11 +74,11 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = json-glib.pc CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -110,6 +110,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(pkgconfigdir)" DATA = $(pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ @@ -124,9 +130,11 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -155,6 +163,8 @@ am__relativize = \ GZIP_ENV = --best DIST_ARCHIVES = $(distdir).tar.xz distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -182,11 +192,10 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCOV_CFLAGS = @GCOV_CFLAGS@ -GCOV_LDFLAGS = @GCOV_LDFLAGS@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -218,6 +227,8 @@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ JSON_CFLAGS = @JSON_CFLAGS@ JSON_DEBUG_CFLAGS = @JSON_DEBUG_CFLAGS@ +JSON_GCOV_CFLAGS = @JSON_GCOV_CFLAGS@ +JSON_GCOV_LDADD = @JSON_GCOV_LDADD@ JSON_LIBS = @JSON_LIBS@ JSON_LT_LDFLAGS = @JSON_LT_LDFLAGS@ JSON_MAJOR_VERSION = @JSON_MAJOR_VERSION@ @@ -237,6 +248,8 @@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LTP = @LTP@ +LTP_GENHTML = @LTP_GENHTML@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -266,6 +279,7 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -348,7 +362,7 @@ all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build/autotools/Makefile.am.gtest $(top_srcdir)/build/autotools/Makefile.am.silent $(am__configure_deps) @for dep in $?; do \ @@ -373,6 +387,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/build/autotools/Makefile.am.gtest $(top_srcdir)/build/autotools/Makefile.am.silent: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -384,10 +399,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -427,9 +440,7 @@ uninstall-pkgconfigDATA: @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -641,14 +652,18 @@ dist-gzip: distdir $(am__remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__remove_distdir) dist-lzma: distdir tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma $(am__remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__remove_distdir) dist-tarZ: distdir @@ -665,7 +680,7 @@ dist-zip: distdir $(am__remove_distdir) dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then @@ -679,6 +694,8 @@ distcheck: dist bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -698,6 +715,7 @@ distcheck: dist && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -726,8 +744,16 @@ distcheck: dist list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -762,10 +788,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -854,8 +885,8 @@ uninstall-am: uninstall-pkgconfigDATA .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am check-local clean \ clean-generic clean-libtool ctags ctags-recursive dist \ - dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \ - dist-tarZ dist-xz dist-zip distcheck distclean \ + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma \ + dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ distclean-generic distclean-hdr distclean-libtool \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ @@ -943,8 +974,27 @@ dist-hook: echo A git checkout is required to generate a ChangeLog >&2; \ fi -gcov: - ( cd json-glib && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? +# use recursive makes in order to ignore errors during check/perf +@ENABLE_GCOV_TRUE@lcov: +@ENABLE_GCOV_TRUE@ -$(MAKE) $(AM_MAKEFLAGS) check +@ENABLE_GCOV_TRUE@ $(MAKE) $(AM_MAKEFLAGS) genlcov + +# we have to massage the lcov.info file slightly to hide the effect of libtool +# placing the objects files in the .libs/ directory separate from the *.c +@ENABLE_GCOV_TRUE@genlcov: +@ENABLE_GCOV_TRUE@ $(LTP) --directory $(top_builddir) --capture --output-file json-lcov.info --test-name JSON_TEST --no-checksum +@ENABLE_GCOV_TRUE@ $(SED) -e 's#.libs/##' < json-lcov.info > json-lcov.info.tmp +@ENABLE_GCOV_TRUE@ LANG=C $(LTP_GENHTML) --prefix $(top_builddir) --output-directory json-lcov --title "JSON-GLib Code Coverage" --show-details json-lcov.info.tmp +@ENABLE_GCOV_TRUE@ rm -f json-lcov.info.tmp + +@ENABLE_GCOV_TRUE@lcov-clean: +@ENABLE_GCOV_TRUE@ -$(LTP) --directory $(top_builddir) -z +@ENABLE_GCOV_TRUE@ -$(RM) -rf json-lcov.info json-lcov +@ENABLE_GCOV_FALSE@lcov genlcov lcov-clean: +@ENABLE_GCOV_FALSE@ @echo You need to configure JSON-GLib with support for gcov enabled. +@ENABLE_GCOV_FALSE@ @echo e.g., ./configure --enable-gcov + +.PHONY: lcov genlcov lcov-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/NEWS b/NEWS index fdfae67..0321670 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,13 @@ -Overview of changes for 0.14.2 +Overview of changes for 0.16.0 ============================== -• Build fixes for compiling against the latest GLib [Matthias Clasen] -• Documentation fixes +• Fixes for building with VisualStudio. [Chun-wei Fan] +• Allow out-of-tree builds. [Colin Walters] +• Bump the dependency on GLib to 2.31. +• Use the new deprecation system provided by GLib. +• Simplify the value handling inside JsonNode. +• Use lcov to generate coverage reports for the test suite. +• Check expected ABI when building. +• Drop dependency on gnome-autogen.sh when building from Git. Overview of changes for 0.14.0 ============================== diff --git a/README b/README deleted file mode 100644 index d50bfb0..0000000 --- a/README +++ /dev/null @@ -1,103 +0,0 @@ -JSON-GLib - A JSON parser for GLib-based libraries and applications -=============================================================================== - -JSON-GLib implements a full JSON parser using GLib and GObject. - -Use JSON-GLib it is possible to parse and generate valid JSON data -structures, using a DOM-like API. JSON-GLib also offers GObject -integration, providing the ability to serialize and deserialize -GObject instances to and from JSON data types. - -JSON is the JavaScript Object Notation; it can be used to represent -objects and object hierarchies while retaining human-readability. - -GLib is a C library providing common and efficient data types for -the C developers. - -GObject is a library providing a run-time Object Oriented type system -for C developers. GLib and GObject are extensively used by the GTK+ -toolkit and by the GNOME project. - -For more information, see: - • JSON: http://www.json.org - • GLib and GObject: http://www.gtk.org - -REQUIREMENTS ------------- -In order to build JSON-GLib you will need: - - • pkg-config - • gtk-doc ≥ 1.13 - • GLib, GIO ≥ 2.26 - -Optionally, JSON-GLib depends on: - - • GObject-Introspection ≥ 0.9.5 - -INSTALLATION -------------------------------------------------------------------------------- -To build JSON-GLib just run: - - $ ./configure - $ make all - # make install - -BUGS -------------------------------------------------------------------------------- -If you find a bug in JSON-GLib, please create a Bugzilla entry here: - - http://bugzilla.gnome.org/enter_bug.cgi?product=json-glib - -Attaching: - - • the version of JSON-GLib - ◦ if it is a development version, the branch of the git repository - • the JSON data that produced the bug (if any) - • a small test case, if none of the test units exhibit the behaviour - • in case of a segmentation fault, a full stack trace with debugging - symbols obtained through gdb is greatly appreaciated - -RELEASE NOTES -------------------------------------------------------------------------------- -• Prior to JSON-GLib 0.10, a JsonSerializable implementation could - automatically fall back to the default serialization code by simply - returning NULL from an overridden JsonSerializable::serialize_property() - virtual function. Since JSON-GLib 0.10 this is not possible any more. A - JsonSerializable is always expected to serialize and deserialize all - properties. JSON-GLib provides public API for the default implementation - in case the serialization code wants to fall back to that. - -HACKING -------------------------------------------------------------------------------- -JSON-GLib is developed mainly inside a GIT repository available at: - - http://git.gnome.org/browse/json-glib - -You can clone the GIT repository with: - - git clone git://git.gnome.org/json-glib - -If you want to contribute functionality or bug fixes to JSON-GLib you -can either notify me to pull from your GIT repository or send me a set -of patches using: - - git format-patch master -k -s - -or: - - git send-email -k -s - -Make sure you always run the test suite when you are fixing bugs. New -features should come with a test unit. - -AUTHOR, COPYRIGHT AND LICENSING -------------------------------------------------------------------------------- -JSON-GLib has been written by Emmanuele Bassi - -JSON-GLib is released under the terms of the GNU Lesser General Public License, -either version 2.1 or (at your option) any later version. - -See the file COPYING for details. - -Copyright (C) 2007, 2008 OpenedHand Ltd -Copyright (C) 2009, 2010 Intel Corp. diff --git a/aclocal.m4 b/aclocal.m4 index 02f1e3a..8bf1951 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.11.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, +# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,1384 +20,1438 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) -# AM_AUX_DIR_EXPAND -*- Autoconf -*- +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) # -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir # -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac # -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. # -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) +pkg_failed=no +AC_MSG_CHECKING([for $1]) -# AM_CONDITIONAL -*- Autoconf -*- +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) -# serial 9 +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +$$1_PKG_ERRORS -# serial 10 +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... +_PKG_TEXT]) + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. +_PKG_TEXT -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl +To get pkg-config, see .]) + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +# Configure paths for GLIB +# Owen Taylor 1997-2001 -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub +dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, +dnl gthread, or gio is specified in MODULES, pass to pkg-config +dnl +AC_DEFUN([AM_PATH_GLIB_2_0], +[dnl +dnl Get the cflags and libraries from pkg-config +dnl +AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], + , enable_glibtest=yes) - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - am__universal=false - m4_case([$1], [CC], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac], - [CXX], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac]) + pkg_config_args=glib-2.0 + for module in . $4 + do + case "$module" in + gmodule) + pkg_config_args="$pkg_config_args gmodule-2.0" + ;; + gmodule-no-export) + pkg_config_args="$pkg_config_args gmodule-no-export-2.0" + ;; + gobject) + pkg_config_args="$pkg_config_args gobject-2.0" + ;; + gthread) + pkg_config_args="$pkg_config_args gthread-2.0" + ;; + gio*) + pkg_config_args="$pkg_config_args $module-2.0" + ;; + esac + done - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + PKG_PROG_PKG_CONFIG([0.16]) - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done + no_glib="" - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) + if test "x$PKG_CONFIG" = x ; then + no_glib=yes + PKG_CONFIG=no + fi + min_glib_version=ifelse([$1], ,2.0.0,$1) + AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) + if test x$PKG_CONFIG != xno ; then + ## don't try to run the test against uninstalled libtool libs + if $PKG_CONFIG --uninstalled $pkg_config_args; then + echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" + enable_glibtest=no + fi + if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then + : + else + no_glib=yes + fi + fi -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -]) + if test x"$no_glib" = x ; then + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` + GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` + GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` -# Generate code to set up dependency tracking. -*- Autoconf -*- + GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` + GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` + glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_glibtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$GLIB_LIBS $LIBS" +dnl +dnl Now check if the installed GLIB is sufficiently new. (Also sanity +dnl checks the results of pkg-config to some extent) +dnl + rm -f conf.glibtest + AC_TRY_RUN([ +#include +#include +#include -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +int +main () +{ + unsigned int major, minor, micro; + char *tmp_version; -#serial 5 - -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done -} -])# _AM_OUTPUT_DEPENDENCY_COMMANDS + fclose (fopen ("conf.glibtest", "w")); + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_glib_version"); + if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_glib_version"); + exit(1); + } -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) + if ((glib_major_version != $glib_config_major_version) || + (glib_minor_version != $glib_config_minor_version) || + (glib_micro_version != $glib_config_micro_version)) + { + printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", + $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, + glib_major_version, glib_minor_version, glib_micro_version); + printf ("*** was found! If pkg-config was correct, then it is best\n"); + printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); + printf("*** to point to the correct configuration files\n"); + } + else if ((glib_major_version != GLIB_MAJOR_VERSION) || + (glib_minor_version != GLIB_MINOR_VERSION) || + (glib_micro_version != GLIB_MICRO_VERSION)) + { + printf("*** GLIB header files (version %d.%d.%d) do not match\n", + GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + glib_major_version, glib_minor_version, glib_micro_version); + } + else + { + if ((glib_major_version > major) || + ((glib_major_version == major) && (glib_minor_version > minor)) || + ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", + glib_major_version, glib_minor_version, glib_micro_version); + printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", + major, minor, micro); + printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); + printf("*** correct copy of pkg-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_glib" = x ; then + AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$PKG_CONFIG" = "no" ; then + echo "*** A new enough version of pkg-config was not found." + echo "*** See http://www.freedesktop.org/software/pkgconfig/" + else + if test -f conf.glibtest ; then + : + else + echo "*** Could not run GLIB test program, checking why..." + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" + echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GLIB_CFLAGS="" + GLIB_LIBS="" + GLIB_GENMARSHAL="" + GOBJECT_QUERY="" + GLIB_MKENUMS="" + GLIB_COMPILE_RESOURCES="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + AC_SUBST(GLIB_GENMARSHAL) + AC_SUBST(GOBJECT_QUERY) + AC_SUBST(GLIB_MKENUMS) + AC_SUBST(GLIB_COMPILE_RESOURCES) + rm -f conf.glibtest ]) -# Do all the work for Automake. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 +# serial 1 -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.11' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.11.3], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -fi +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.11.3])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl +# AM_AUX_DIR_EXPAND -*- Autoconf -*- -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. -AC_CONFIG_COMMANDS_PRE(dnl -[m4_provide_if([_AM_COMPILER_EXEEXT], - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) - -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further -dnl mangled by Autoconf and run in a shell conditional statement. -m4_define([_AC_COMPILER_EXEEXT], -m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_arg=$1 -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) +# serial 1 -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi -AC_SUBST(install_sh)]) - -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` +]) -# Check to see how 'make' treats includes. -*- Autoconf -*- +# AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 9 -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, +# 2010, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 +# serial 12 -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "GCJ", or "OBJC". +# We try a few techniques and use that to set a single cache variable. # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl -# serial 6 +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], UPC, [depcc="$UPC" am_compiler_list=], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + am_cv_$1_dependencies_compiler_type=none fi ]) - -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ]) -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# AM_RUN_LOG(COMMAND) -# ------------------- -# Run COMMAND, save the exit status in ac_status, and log it. -# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) -AC_DEFUN([AM_RUN_LOG], -[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD - ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - (exit $ac_status); }]) +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl +]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- +# Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +#serial 5 -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[[\\\"\#\$\&\'\`$am_lf]]*) - AC_MSG_ERROR([unsafe absolute working directory name]);; -esac -case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; -esac - -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) -# Copyright (C) 2009 Free Software Foundation, Inc. +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# AM_SILENT_RULES([DEFAULT]) -# -------------------------- -# Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). -AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; -esac -AC_SUBST([AM_DEFAULT_VERBOSITY])dnl -AM_BACKSLASH='\' -AC_SUBST([AM_BACKSLASH])dnl -_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 16 -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. -# AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.62])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi -# Check how to create a tarball. -*- Autoconf -*- +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl -# serial 2 +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AM_PROG_MKDIR_P])dnl +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +]) +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +]) - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, +# Inc. # -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) +# serial 1 -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])# PKG_PROG_PKG_CONFIG +AC_SUBST(install_sh)]) -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. # -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG +# serial 2 -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) +# Check to see how 'make' treats includes. -*- Autoconf -*- -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. # -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -pkg_failed=no -AC_MSG_CHECKING([for $1]) +# serial 4 -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) +# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +# serial 6 - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: +# AM_PROG_CC_C_O +# -------------- +# Like AC_PROG_CC_C_O, but changed for automake. +AC_DEFUN([AM_PROG_CC_C_O], +[AC_REQUIRE([AC_PROG_CC_C_O])dnl +AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +# FIXME: we rely on the cache variable name because +# there is no other way. +set dummy $CC +am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o +if test "$am_t" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +dnl Make sure AC_PROG_CC is never called again, or it will override our +dnl setting of CC. +m4_define([AC_PROG_CC], + [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) +]) -$$1_PKG_ERRORS +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -_PKG_TEXT]) - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. +# serial 6 -_PKG_TEXT +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) -To get pkg-config, see .]) - ]) + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])# PKG_CHECK_MODULES + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) +fi +]) -# Configure paths for GLIB -# Owen Taylor 1997-2001 +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, +# Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, -dnl gthread, or gio is specified in MODULES, pass to pkg-config -dnl -AC_DEFUN([AM_PATH_GLIB_2_0], -[dnl -dnl Get the cflags and libraries from pkg-config -dnl -AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], - , enable_glibtest=yes) +# serial 1 - pkg_config_args=glib-2.0 - for module in . $4 - do - case "$module" in - gmodule) - pkg_config_args="$pkg_config_args gmodule-2.0" - ;; - gmodule-no-export) - pkg_config_args="$pkg_config_args gmodule-no-export-2.0" - ;; - gobject) - pkg_config_args="$pkg_config_args gobject-2.0" - ;; - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - gio*) - pkg_config_args="$pkg_config_args $module-2.0" - ;; - esac - done +# AM_PROG_MKDIR_P +# --------------- +# Check for `mkdir -p'. +AC_DEFUN([AM_PROG_MKDIR_P], +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac +]) - PKG_PROG_PKG_CONFIG([0.16]) +# Helper functions for option handling. -*- Autoconf -*- - no_glib="" +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software +# Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - if test "x$PKG_CONFIG" = x ; then - no_glib=yes - PKG_CONFIG=no - fi +# serial 5 - min_glib_version=ifelse([$1], ,2.0.0,$1) - AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" - enable_glibtest=no - fi +# _AM_SET_OPTION(NAME) +# -------------------- +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then - : - else - no_glib=yes - fi - fi +# _AM_SET_OPTIONS(OPTIONS) +# ------------------------ +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - if test x"$no_glib" = x ; then - GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` - GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` - GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` - GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` - glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" -dnl -dnl Now check if the installed GLIB is sufficiently new. (Also sanity -dnl checks the results of pkg-config to some extent) +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 1 + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 5 + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +esac + +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi + + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT(yes)]) + +# Copyright (C) 2009, 2011 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# (`yes' being less verbose, `no' or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], +[ --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0')]) +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac dnl - rm -f conf.glibtest - AC_TRY_RUN([ -#include -#include -#include +dnl A few `make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using `$V' instead of `$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) -int -main () -{ - unsigned int major, minor, micro; - char *tmp_version; +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - fclose (fopen ("conf.glibtest", "w")); +# serial 1 - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_glib_version"); - if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); - exit(1); - } +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) - if ((glib_major_version != $glib_config_major_version) || - (glib_minor_version != $glib_config_minor_version) || - (glib_micro_version != $glib_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((glib_major_version != GLIB_MAJOR_VERSION) || - (glib_minor_version != GLIB_MINOR_VERSION) || - (glib_micro_version != GLIB_MICRO_VERSION)) - { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - glib_major_version, glib_minor_version, glib_micro_version); - } - else - { - if ((glib_major_version > major) || - ((glib_major_version == major) && (glib_minor_version > minor)) || - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", - glib_major_version, glib_minor_version, glib_micro_version); - printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", - major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_glib" = x ; then - AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://www.freedesktop.org/software/pkgconfig/" - else - if test -f conf.glibtest ; then - : - else - echo "*** Could not run GLIB test program, checking why..." - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GLIB_CFLAGS="" - GLIB_LIBS="" - GLIB_GENMARSHAL="" - GOBJECT_QUERY="" - GLIB_MKENUMS="" - ifelse([$3], , :, [$3]) +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 3 + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + +# AM_SUBST_NOTMAKE(VARIABLE) +# -------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break fi - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - AC_SUBST(GLIB_GENMARSHAL) - AC_SUBST(GOBJECT_QUERY) - AC_SUBST(GLIB_MKENUMS) - rm -f conf.glibtest -]) +done +rm -rf conftest.dir + +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR m4_include([build/autotools/as-compiler-flag.m4]) m4_include([build/autotools/as-linguas.m4]) diff --git a/build/Makefile.in b/build/Makefile.in index bb21962..73a334f 100644 --- a/build/Makefile.in +++ b/build/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -64,11 +64,11 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -139,11 +139,10 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCOV_CFLAGS = @GCOV_CFLAGS@ -GCOV_LDFLAGS = @GCOV_LDFLAGS@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -175,6 +174,8 @@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ JSON_CFLAGS = @JSON_CFLAGS@ JSON_DEBUG_CFLAGS = @JSON_DEBUG_CFLAGS@ +JSON_GCOV_CFLAGS = @JSON_GCOV_CFLAGS@ +JSON_GCOV_LDADD = @JSON_GCOV_LDADD@ JSON_LIBS = @JSON_LIBS@ JSON_LT_LDFLAGS = @JSON_LT_LDFLAGS@ JSON_MAJOR_VERSION = @JSON_MAJOR_VERSION@ @@ -194,6 +195,8 @@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LTP = @LTP@ +LTP_GENHTML = @LTP_GENHTML@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -223,6 +226,7 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -531,10 +535,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff --git a/build/autotools/Makefile.am b/build/autotools/Makefile.am index cc2d11c..ca20ec7 100644 --- a/build/autotools/Makefile.am +++ b/build/autotools/Makefile.am @@ -6,7 +6,6 @@ EXTRA_DIST = \ Makefile.am.enums \ Makefile.am.marshal \ Makefile.am.gtest \ - Makefile.am.gcov \ Makefile.am.gitignore # needed to avoid including Makefile.am.gtest diff --git a/build/autotools/Makefile.am.gcov b/build/autotools/Makefile.am.gcov deleted file mode 100644 index 9786df9..0000000 --- a/build/autotools/Makefile.am.gcov +++ /dev/null @@ -1,35 +0,0 @@ -if GCOV_ENABLED -gcov-report.txt: gcov-clean - $(QUIET_GEN)(rm -f $@; \ - echo -e "Test coverage for json-glib:\n" >> $@; \ - total_covered=0; total_actual=0; \ - for file in $(filter %.c,$(gcov_sources)); do \ - gcov -o .libs/$${file/.c/.gcda} $$file > /dev/null; \ - if test -f $$file.gcov; then \ - actual=`grep -v ' -:' $$file.gcov | wc -l`; \ - uncovered=`grep '#####:' $$file.gcov | wc -l`; \ - covered=$$((actual - uncovered)); \ - total_covered=$$((total_covered + covered)); \ - total_actual=$$((total_actual + actual)); \ - echo -e "$$file: \t$$covered / $$actual\t($$((($$covered * 100) / $$actual))%)"; \ - fi \ - done >> $@; \ - cd $(abs_srcdir); \ - echo -e "\nSource lines: $$total_actual\nCovered statements: $$total_covered\nTotal coverage: $$((($$total_covered * 100) / $$total_actual))%" >> $@) - -gcov: gcov-report.txt - @cat gcov-report.txt -gcov-clean: - @find . -name "*.gcda" -o -name "*.gcov" -delete -else -gcov-report.txt: - @true -gcov-clean: - @true -gcov: - @echo "Need to reconfigure with --enable-gcov" -endif # GCOV_ENABLED - -.PHONY: gcov gcov-clean gcov-report.txt - -check-local: gcov diff --git a/build/autotools/Makefile.in b/build/autotools/Makefile.in index a5d0333..ca06d3c 100644 --- a/build/autotools/Makefile.in +++ b/build/autotools/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -62,11 +62,11 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -97,11 +97,10 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCOV_CFLAGS = @GCOV_CFLAGS@ -GCOV_LDFLAGS = @GCOV_LDFLAGS@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -133,6 +132,8 @@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ JSON_CFLAGS = @JSON_CFLAGS@ JSON_DEBUG_CFLAGS = @JSON_DEBUG_CFLAGS@ +JSON_GCOV_CFLAGS = @JSON_GCOV_CFLAGS@ +JSON_GCOV_LDADD = @JSON_GCOV_LDADD@ JSON_LIBS = @JSON_LIBS@ JSON_LT_LDFLAGS = @JSON_LT_LDFLAGS@ JSON_MAJOR_VERSION = @JSON_MAJOR_VERSION@ @@ -152,6 +153,8 @@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LTP = @LTP@ +LTP_GENHTML = @LTP_GENHTML@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -181,6 +184,7 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -247,7 +251,6 @@ EXTRA_DIST = \ Makefile.am.enums \ Makefile.am.marshal \ Makefile.am.gtest \ - Makefile.am.gcov \ Makefile.am.gitignore all: all-am @@ -341,10 +344,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff --git a/build/autotools/libtool.m4 b/build/autotools/libtool.m4 index 88de383..56666f0 100644 --- a/build/autotools/libtool.m4 +++ b/build/autotools/libtool.m4 @@ -1,8 +1,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -11,8 +11,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -146,6 +146,8 @@ AC_REQUIRE([AC_CANONICAL_BUILD])dnl AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -637,7 +639,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -801,6 +803,7 @@ AC_DEFUN([LT_LANG], m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -822,6 +825,31 @@ m4_defun([_LT_LANG], ])# _LT_LANG +m4_ifndef([AC_PROG_GO], [ +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -852,6 +880,10 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ], m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -954,7 +986,13 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -962,6 +1000,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ rm -rf libconftest.dylib* rm -f conftest.* fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -973,6 +1012,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], [lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF @@ -990,7 +1030,9 @@ _LT_EOF echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1035,8 +1077,8 @@ _LT_EOF ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1047,6 +1089,8 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported if test "$lt_cv_ld_force_load" = "yes"; then _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi @@ -1330,14 +1374,27 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -1414,13 +1471,13 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -1600,6 +1657,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -1639,7 +1701,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -2185,7 +2247,7 @@ need_version=unknown case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2194,7 +2256,7 @@ aix3*) ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2259,7 +2321,7 @@ beos*) ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -2398,7 +2460,7 @@ m4_if([$1], [],[ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -2406,10 +2468,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -2417,7 +2475,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -2435,7 +2493,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -2455,17 +2513,18 @@ freebsd* | dragonfly*) ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -2526,7 +2585,7 @@ hpux9* | hpux10* | hpux11*) ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -2542,7 +2601,7 @@ irix5* | irix6* | nonstopux*) nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -2579,9 +2638,9 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2648,7 +2707,7 @@ netbsd*) ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -2717,7 +2776,7 @@ rdos*) ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2742,7 +2801,7 @@ sunos4*) ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -2766,7 +2825,7 @@ sysv4 | sysv4.3*) sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -2797,7 +2856,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2807,7 +2866,7 @@ tpf*) ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -3229,7 +3288,7 @@ irix5* | irix6* | nonstopux*) lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -3649,6 +3708,7 @@ for ac_symprfx in "" "_"; do # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -4233,7 +4293,9 @@ m4_if([$1], [CXX], [ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi ;; esac else @@ -4325,18 +4387,33 @@ m4_if([$1], [CXX], [ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; esac ;; esac @@ -4496,7 +4573,9 @@ m4_if([$1], [CXX], [ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] @@ -4521,7 +4600,6 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -4772,8 +4850,7 @@ _LT_EOF xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ @@ -5068,6 +5145,7 @@ _LT_EOF # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' @@ -5114,10 +5192,6 @@ _LT_EOF _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -5130,7 +5204,7 @@ _LT_EOF ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5169,7 +5243,6 @@ _LT_EOF fi if test "$with_gnu_ld" = no; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -5611,9 +5684,6 @@ _LT_TAGDECL([], [no_undefined_flag], [1], _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], - [[If ld is used when linking, flag to hardcode $libdir into a binary - during linking. This must work even if $libdir does not exist]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -5771,7 +5841,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -6141,7 +6210,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -6902,12 +6971,18 @@ public class foo { } }; _LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) _lt_libdeps_save_CFLAGS=$CFLAGS case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac dnl Parse the compiler output and extract the necessary @@ -7104,7 +7179,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7237,7 +7311,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7424,6 +7497,77 @@ CFLAGS=$lt_save_CFLAGS ])# _LT_LANG_GCJ_CONFIG +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -7493,6 +7637,13 @@ dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], diff --git a/build/autotools/ltoptions.m4 b/build/autotools/ltoptions.m4 index 17cfd51..5d9acd8 100644 --- a/build/autotools/ltoptions.m4 +++ b/build/autotools/ltoptions.m4 @@ -326,9 +326,24 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) diff --git a/build/autotools/ltversion.m4 b/build/autotools/ltversion.m4 index 9c7b5d4..07a8602 100644 --- a/build/autotools/ltversion.m4 +++ b/build/autotools/ltversion.m4 @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3293 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4]) -m4_define([LT_PACKAGE_REVISION], [1.3293]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4' -macro_revision='1.3293' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff --git a/build/compile b/build/compile index c0096a7..b1f4749 100755 --- a/build/compile +++ b/build/compile @@ -1,10 +1,10 @@ #! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. +# Wrapper for compilers which do not understand '-c -o'. -scriptversion=2009-10-06.20; # UTC +scriptversion=2012-01-04.17; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software -# Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free +# Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -29,21 +29,186 @@ scriptversion=2009-10-06.20; # UTC # bugs to or send patches to # . +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l*) + lib=${1#-l} + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + set x "$@" "$dir/$lib.dll.lib" + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + set x "$@" "$dir/$lib.lib" + break + fi + done + IFS=$save_IFS + + test "$found" != yes && set x "$@" "$lib.lib" + shift + ;; + -L*) + func_file_conv "${1#-L}" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: compile [--help] [--version] PROGRAM [ARGS] -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining arguments, and rename the output as expected. If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. +right script to run: please start by reading the file 'INSTALL'. Report bugs to . EOF @@ -53,11 +218,13 @@ EOF echo "compile $scriptversion" exit $? ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; esac ofile= cfile= -eat= for arg do @@ -66,8 +233,8 @@ do else case $1 in -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. eat=1 case $2 in *.o | *.obj) @@ -94,10 +261,10 @@ do done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a + # If no '-o' option was seen then we might have been invoked from a # pattern rule where we don't need one. That is ok -- this is a # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also + # '.c' file was seen then we are probably linking. That is also # ok. exec "$@" fi @@ -106,7 +273,7 @@ fi cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name +# Note: use '[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d diff --git a/build/config.guess b/build/config.guess index dc84c68..49ba16f 100755 --- a/build/config.guess +++ b/build/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2012-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -56,8 +56,9 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -144,7 +145,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -180,7 +181,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -223,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -269,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -295,7 +299,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@ -394,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -480,8 +484,8 @@ EOF echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -494,7 +498,7 @@ EOF else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -551,7 +555,7 @@ EOF echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -594,52 +598,52 @@ EOF 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c - #define _HPUX_SOURCE - #include - #include + #define _HPUX_SOURCE + #include + #include - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -730,22 +734,22 @@ EOF exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -769,14 +773,14 @@ EOF exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -788,13 +792,12 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -803,15 +806,18 @@ EOF *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -866,7 +872,7 @@ EOF EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} @@ -878,20 +884,29 @@ EOF then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -933,7 +948,7 @@ EOF test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -959,7 +974,7 @@ EOF echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -967,14 +982,17 @@ EOF sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -983,11 +1001,11 @@ EOF echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1019,7 +1037,7 @@ EOF fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1047,13 +1065,13 @@ EOF exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1088,8 +1106,8 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1132,10 +1150,10 @@ EOF echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1161,11 +1179,11 @@ EOF exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1230,6 +1248,9 @@ EOF *:QNX:*:4*) echo i386-pc-qnx exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; @@ -1275,13 +1296,13 @@ EOF echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1321,11 +1342,11 @@ main () #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff --git a/build/config.sub b/build/config.sub index 2a55a50..d6b6b3c 100755 --- a/build/config.sub +++ b/build/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2012-01-01' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -75,8 +75,9 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,8 +124,9 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os @@ -156,8 +158,8 @@ case $os in os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -173,10 +175,10 @@ case $os in os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -249,13 +251,17 @@ case $basic_machine in | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ @@ -281,29 +287,39 @@ case $basic_machine in | moxie \ | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ + | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. basic_machine=$basic_machine-unknown os=-none ;; @@ -313,6 +329,18 @@ case $basic_machine in basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -332,16 +360,19 @@ case $basic_machine in | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ @@ -367,25 +398,29 @@ case $basic_machine in | mmix-* \ | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -410,7 +445,7 @@ case $basic_machine in basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -480,11 +515,20 @@ case $basic_machine in basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -516,7 +560,7 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -674,7 +718,6 @@ case $basic_machine in i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -732,7 +775,7 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze) basic_machine=microblaze-xilinx ;; mingw32) @@ -771,10 +814,18 @@ case $basic_machine in ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -839,6 +890,12 @@ case $basic_machine in np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -921,9 +978,10 @@ case $basic_machine in ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -1017,6 +1075,9 @@ case $basic_machine in basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1073,20 +1134,8 @@ case $basic_machine in basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1156,6 +1205,9 @@ case $basic_machine in xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1253,11 +1305,11 @@ esac if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1293,8 +1345,9 @@ case $os in | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1341,7 +1394,7 @@ case $os in -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1390,7 +1443,7 @@ case $os in -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1435,6 +1488,8 @@ case $os in -dicos*) os=-dicos ;; + -nacl*) + ;; -none) ;; *) @@ -1457,10 +1512,10 @@ else # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1472,8 +1527,17 @@ case $basic_machine in arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1493,14 +1557,11 @@ case $basic_machine in ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1527,7 +1588,7 @@ case $basic_machine in *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) diff --git a/build/depcomp b/build/depcomp index df8eea7..bd0ac08 100755 --- a/build/depcomp +++ b/build/depcomp @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-12-04.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, +# 2011 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -44,7 +44,7 @@ Environment variables: object Object file output by `PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -90,10 +90,18 @@ if test "$depmode" = msvcmsys; then # This is just like msvisualcpp but w/o cygpath translation. # Just convert the backslash-escaped backslashes to single forward # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" + cygpath_u='sed s,\\\\,/,g' depmode=msvisualcpp fi +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -158,10 +166,12 @@ gcc) ' < "$tmpdepfile" | ## Some versions of gcc put a space before the `:'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -405,6 +415,52 @@ tru64) rm -f "$tmpdepfile" ;; +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test "$stat" = 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/ \1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/ / + G + p +}' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. @@ -503,7 +559,9 @@ makedepend) touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" sed '1,2d' "$tmpdepfile" | tr ' ' ' ' | \ ## Some versions of the HPUX 10.20 sed can't process this invocation diff --git a/build/install-sh b/build/install-sh index 6781b98..a9244eb 100755 --- a/build/install-sh +++ b/build/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-01-19.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -156,6 +156,10 @@ while test $# -ne 0; do -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then fi shift # arg dst_arg=$arg + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -200,7 +208,11 @@ if test $# -eq 0; then fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ fi for src do - # Protect names starting with `-'. + # Protect names problematic for `test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ do echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -385,7 +392,7 @@ do case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ do for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff --git a/build/ltmain.sh b/build/ltmain.sh old mode 100755 new mode 100644 index aa5624c..63ae69d --- a/build/ltmain.sh +++ b/build/ltmain.sh @@ -1,9 +1,9 @@ -# libtool (GNU libtool) 2.4 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -41,6 +41,7 @@ # --quiet, --silent don't print informational messages # --no-quiet, --no-silent # print informational messages (default) +# --no-warn don't display warning messages # --tag=TAG use configuration variables from tag TAG # -v, --verbose print more informational messages than default # --no-verbose don't print the extra informational messages @@ -69,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4 +# $progname: (GNU libtool) 2.4.2 # automake: $automake_version # autoconf: $autoconf_version # @@ -79,9 +80,9 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4 +VERSION=2.4.2 TIMESTAMP="" -package_revision=1.3293 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -136,15 +137,10 @@ progpath="$0" : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${EGREP="/bin/grep -E"} -: ${FGREP="/bin/grep -F"} -: ${GREP="/bin/grep"} -: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="/bin/sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -387,7 +383,7 @@ case $progpath in ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -771,8 +767,8 @@ func_help () s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p d } @@ -1052,6 +1048,7 @@ opt_finish=false opt_help=false opt_help_all=false opt_silent=: +opt_warning=: opt_verbose=: opt_silent=false opt_verbose=false @@ -1120,6 +1117,10 @@ esac opt_silent=false func_append preserve_args " $opt" ;; + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; --no-verbose) opt_verbose=false func_append preserve_args " $opt" @@ -2059,7 +2060,7 @@ func_mode_compile () *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -3201,11 +3202,13 @@ func_mode_install () # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3470,7 +3473,7 @@ static const void *lt_preloaded_setup() { # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -3982,14 +3985,17 @@ func_exec_program_core () # launches target application with the remaining arguments. func_exec_program () { - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac func_exec_program_core \${1+\"\$@\"} } @@ -5057,9 +5063,15 @@ void lt_dump_script (FILE* f) { EOF func_emit_wrapper yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' - + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' cat <<"EOF" } EOF @@ -5643,7 +5655,8 @@ func_mode_link () continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6147,7 +6160,8 @@ func_mode_link () lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -6831,7 +6845,7 @@ func_mode_link () test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" + add_dir="-L$absdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -7316,6 +7330,7 @@ func_mode_link () # which has an extra 1 added just for fun # case $version_type in + # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result @@ -7432,7 +7447,7 @@ func_mode_link () versuffix="$major.$revision" ;; - linux) + linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -8020,6 +8035,11 @@ EOF # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= @@ -8050,7 +8070,7 @@ EOF elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_apped perm_rpath " $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -8058,11 +8078,7 @@ EOF if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. @@ -9152,6 +9168,8 @@ EOF esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" @@ -9261,7 +9279,8 @@ EOF *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" diff --git a/build/missing b/build/missing index 28055d2..86a8fc3 100755 --- a/build/missing +++ b/build/missing @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.13; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -84,7 +84,6 @@ Supported PROGRAM values: help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and @@ -122,15 +121,6 @@ case $1 in # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -226,7 +216,7 @@ WARNING: \`$1' $msg. You should only need it if \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -256,7 +246,7 @@ WARNING: \`$1' is $msg. You should only need it if \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -318,41 +308,6 @@ WARNING: \`$1' is $msg. You should only need it if touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg. diff --git a/build/win32/Makefile.in b/build/win32/Makefile.in index 31115f0..98b6c81 100644 --- a/build/win32/Makefile.in +++ b/build/win32/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -63,11 +63,11 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = config.h.win32 CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -138,11 +138,10 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCOV_CFLAGS = @GCOV_CFLAGS@ -GCOV_LDFLAGS = @GCOV_LDFLAGS@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -174,6 +173,8 @@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ JSON_CFLAGS = @JSON_CFLAGS@ JSON_DEBUG_CFLAGS = @JSON_DEBUG_CFLAGS@ +JSON_GCOV_CFLAGS = @JSON_GCOV_CFLAGS@ +JSON_GCOV_LDADD = @JSON_GCOV_LDADD@ JSON_LIBS = @JSON_LIBS@ JSON_LT_LDFLAGS = @JSON_LT_LDFLAGS@ JSON_MAJOR_VERSION = @JSON_MAJOR_VERSION@ @@ -193,6 +194,8 @@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LTP = @LTP@ +LTP_GENHTML = @LTP_GENHTML@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -222,6 +225,7 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -532,10 +536,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff --git a/build/win32/config.h.win32 b/build/win32/config.h.win32 index ae36adc..72783fa 100644 --- a/build/win32/config.h.win32 +++ b/build/win32/config.h.win32 @@ -49,7 +49,7 @@ #define PACKAGE_NAME "json-glib" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "json-glib 0.14.2" +#define PACKAGE_STRING "json-glib 0.15.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "json-glib" @@ -58,7 +58,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.14.2" +#define PACKAGE_VERSION "0.15.2" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 diff --git a/build/win32/vs10/Makefile.in b/build/win32/vs10/Makefile.in index b8535da..841446c 100644 --- a/build/win32/vs10/Makefile.in +++ b/build/win32/vs10/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -62,11 +62,11 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -97,11 +97,10 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCOV_CFLAGS = @GCOV_CFLAGS@ -GCOV_LDFLAGS = @GCOV_LDFLAGS@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -133,6 +132,8 @@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ JSON_CFLAGS = @JSON_CFLAGS@ JSON_DEBUG_CFLAGS = @JSON_DEBUG_CFLAGS@ +JSON_GCOV_CFLAGS = @JSON_GCOV_CFLAGS@ +JSON_GCOV_LDADD = @JSON_GCOV_LDADD@ JSON_LIBS = @JSON_LIBS@ JSON_LT_LDFLAGS = @JSON_LT_LDFLAGS@ JSON_MAJOR_VERSION = @JSON_MAJOR_VERSION@ @@ -152,6 +153,8 @@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LTP = @LTP@ +LTP_GENHTML = @LTP_GENHTML@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -181,6 +184,7 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -367,10 +371,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff --git a/build/win32/vs10/json-glib.props b/build/win32/vs10/json-glib.props index 40f8b0a..c66d282 100644 --- a/build/win32/vs10/json-glib.props +++ b/build/win32/vs10/json-glib.props @@ -1,7 +1,7 @@  - ..\..\..\..\..\vs10\$(Platform) + ..\..\..\..\vs10\$(Platform) $(GlibEtcInstallRoot) 1.0 @@ -73,7 +73,7 @@ copy ..\..\..\json-glib\json-types.h $(CopyDir)\include\json-glib-$(JsonGlibVers - ..\..\..;..\..\..\json-glib;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories) + ..\..\..;..\..\..\json-glib;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories) HAVE_CONFIG_H;G_DISABLE_DEPRECATED;%(PreprocessorDefinitions) msvc_recommended_pragmas.h;%(ForcedIncludeFiles) diff --git a/build/win32/vs10/json-glib.vcxproj b/build/win32/vs10/json-glib.vcxproj index fe3d7e9..f7c6ac7 100644 --- a/build/win32/vs10/json-glib.vcxproj +++ b/build/win32/vs10/json-glib.vcxproj @@ -189,6 +189,7 @@ + @@ -196,7 +197,7 @@ - + diff --git a/build/win32/vs10/json-glib.vcxproj.filters b/build/win32/vs10/json-glib.vcxproj.filters index abbc8ee..bda3c69 100644 --- a/build/win32/vs10/json-glib.vcxproj.filters +++ b/build/win32/vs10/json-glib.vcxproj.filters @@ -21,6 +21,7 @@ Sources Sources Sources + Sources Sources Sources Sources @@ -28,7 +29,7 @@ Sources Sources Sources - Sources + Sources Sources Sources diff --git a/build/win32/vs9/Makefile.in b/build/win32/vs9/Makefile.in index 0c40274..8910a54 100644 --- a/build/win32/vs9/Makefile.in +++ b/build/win32/vs9/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -62,11 +62,11 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -97,11 +97,10 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCOV_CFLAGS = @GCOV_CFLAGS@ -GCOV_LDFLAGS = @GCOV_LDFLAGS@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -133,6 +132,8 @@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ JSON_CFLAGS = @JSON_CFLAGS@ JSON_DEBUG_CFLAGS = @JSON_DEBUG_CFLAGS@ +JSON_GCOV_CFLAGS = @JSON_GCOV_CFLAGS@ +JSON_GCOV_LDADD = @JSON_GCOV_LDADD@ JSON_LIBS = @JSON_LIBS@ JSON_LT_LDFLAGS = @JSON_LT_LDFLAGS@ JSON_MAJOR_VERSION = @JSON_MAJOR_VERSION@ @@ -152,6 +153,8 @@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LTP = @LTP@ +LTP_GENHTML = @LTP_GENHTML@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -181,6 +184,7 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -352,10 +356,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff --git a/build/win32/vs9/json-glib.vcproj b/build/win32/vs9/json-glib.vcproj index a74316f..fee2685 100644 --- a/build/win32/vs9/json-glib.vcproj +++ b/build/win32/vs9/json-glib.vcproj @@ -190,6 +190,7 @@ + @@ -197,7 +198,7 @@ - + diff --git a/build/win32/vs9/json-glib.vsprops b/build/win32/vs9/json-glib.vsprops index f9acd69..2ff379d 100644 --- a/build/win32/vs9/json-glib.vsprops +++ b/build/win32/vs9/json-glib.vsprops @@ -8,7 +8,7 @@ > @@ -94,6 +94,6 @@ copy ..\..\..\json-glib\json-types.h $(OutDir)\include\json-glib-$(JsonGlibVersi /> diff --git a/config.h.in b/config.h.in index 0b6b192..4537a81 100644 --- a/config.h.in +++ b/config.h.in @@ -22,6 +22,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H +/* Whether you have gcov */ +#undef HAVE_GCOV + /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT diff --git a/configure b/configure index 27d656d..595cd4d 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for json-glib 0.14.2. +# Generated by GNU Autoconf 2.68 for json-glib 0.15.2. # # Report bugs to . # @@ -571,8 +571,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='json-glib' PACKAGE_TARNAME='json-glib' -PACKAGE_VERSION='0.14.2' -PACKAGE_STRING='json-glib 0.14.2' +PACKAGE_VERSION='0.15.2' +PACKAGE_STRING='json-glib 0.15.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=json-glib' PACKAGE_URL='http://live.gnome.org/JsonGlib' @@ -663,10 +663,13 @@ HTML_DIR GTKDOC_MKPDF GTKDOC_REBASE GTKDOC_CHECK -GCOV_LDFLAGS -GCOV_CFLAGS -GCOV_ENABLED_FALSE -GCOV_ENABLED_TRUE +ENABLE_GCOV_FALSE +ENABLE_GCOV_TRUE +JSON_GCOV_LDADD +JSON_GCOV_CFLAGS +LTP_GENHTML +LTP +SHTOOL MAINTAINER_CFLAGS JSON_DEBUG_CFLAGS ENABLE_GLIB_TEST_FALSE @@ -675,6 +678,10 @@ JSON_LIBS JSON_CFLAGS GLIB_PREFIX JSON_LT_LDFLAGS +OS_WIN32_FALSE +OS_WIN32_TRUE +OS_LINUX_FALSE +OS_LINUX_TRUE JSON_RELEASE_STATUS JSON_VERSION JSON_MINOR_VERSION @@ -710,6 +717,7 @@ build_vendor build_cpu build LIBTOOL +GLIB_COMPILE_RESOURCES GLIB_MKENUMS GOBJECT_QUERY GLIB_GENMARSHAL @@ -718,6 +726,7 @@ GLIB_CFLAGS am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -736,6 +745,8 @@ PKG_CONFIG_PATH PKG_CONFIG AM_BACKSLASH AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -1381,7 +1392,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures json-glib 0.14.2 to adapt to many kinds of systems. +\`configure' configures json-glib 0.15.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1451,7 +1462,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of json-glib 0.14.2:";; + short | recursive ) echo "Configuration of json-glib 0.15.2:";; esac cat <<\_ACEOF @@ -1470,11 +1481,10 @@ Optional Features: optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) --enable-debug=[no/minimum/yes] - turn on debugging [default=minimum] + turn on debugging [default=yes] --enable-maintainer-flags=[no/yes] - Use strict compiler flags [default=no] - --enable-gcov Whether to enable coverage testing (requires gcc and - gcov) + Use strict compiler flags [default=yes] + --enable-gcov Enable gcov --enable-gtk-doc use gtk-doc to build documentation [[default=no]] --enable-gtk-doc-html build documentation in html format [[default=yes]] --enable-gtk-doc-pdf build documentation in pdf format [[default=no]] @@ -1486,7 +1496,7 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR @@ -1586,7 +1596,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -json-glib configure 0.14.2 +json-glib configure 0.15.2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1864,7 +1874,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by json-glib $as_me 0.14.2, which was +It was created by json-glib $as_me 0.15.2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2686,7 +2696,7 @@ fi # Define the identity of the package. PACKAGE='json-glib' - VERSION='0.14.2' + VERSION='0.15.2' # Some tools Automake needs. @@ -2707,9 +2717,9 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. - -AMTAR=${AMTAR-"${am_missing_run}tar"} +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 @@ -2809,6 +2819,33 @@ yes) AM_DEFAULT_VERBOSITY=0;; no) AM_DEFAULT_VERBOSITY=1;; *) AM_DEFAULT_VERBOSITY=0;; esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi AM_BACKSLASH='\' DEPDIR="${am__leading_dot}deps" @@ -2863,6 +2900,7 @@ fi if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -3676,6 +3714,7 @@ else # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3735,7 +3774,7 @@ else break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -3970,6 +4009,7 @@ $as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; } GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` + GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` @@ -4134,6 +4174,7 @@ rm -f core conftest.err conftest.$ac_objext \ GLIB_GENMARSHAL="" GOBJECT_QUERY="" GLIB_MKENUMS="" + GLIB_COMPILE_RESOURCES="" : fi @@ -4141,6 +4182,7 @@ rm -f core conftest.err conftest.$ac_objext \ + rm -f conf.glibtest if test "x$CC" != xcc; then @@ -4279,8 +4321,8 @@ esac -macro_version='2.4' -macro_revision='1.3293' +macro_version='2.4.2' +macro_revision='1.3337' @@ -5125,6 +5167,11 @@ else lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -5164,7 +5211,7 @@ else # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -5593,7 +5640,7 @@ irix5* | irix6* | nonstopux*) lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -6233,13 +6280,13 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -6386,6 +6433,7 @@ for ac_symprfx in "" "_"; do # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -6774,7 +6822,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -6785,7 +6833,20 @@ sparc*-*solaris*) case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -7425,7 +7486,13 @@ else $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -7436,6 +7503,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } if ${lt_cv_ld_exported_symbols_list+:} false; then : @@ -7468,6 +7536,7 @@ rm -f core conftest.err conftest.$ac_objext \ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } if ${lt_cv_ld_force_load+:} false; then : @@ -7489,7 +7558,9 @@ _LT_EOF echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -7893,7 +7964,22 @@ fi # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -7971,6 +8057,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' + + + + test -z "$LN_S" && LN_S="ln -s" @@ -8430,7 +8520,9 @@ lt_prog_compiler_static= case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -8521,18 +8613,33 @@ lt_prog_compiler_static= ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='' ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; esac ;; esac @@ -8894,7 +9001,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -9144,8 +9250,7 @@ _LT_EOF xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ @@ -9524,6 +9629,7 @@ fi # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' @@ -9569,6 +9675,7 @@ fi hardcode_shlibpath_var=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec='' fi @@ -9597,10 +9704,6 @@ fi hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -9613,7 +9716,7 @@ fi ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -9652,7 +9755,6 @@ fi fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -10276,11 +10378,6 @@ esac - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -10370,7 +10467,7 @@ need_version=unknown case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -10379,7 +10476,7 @@ aix3*) ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -10444,7 +10541,7 @@ beos*) ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -10583,7 +10680,7 @@ darwin* | rhapsody*) ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -10591,10 +10688,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -10602,7 +10695,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -10620,7 +10713,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -10640,17 +10733,18 @@ freebsd* | dragonfly*) ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -10711,7 +10805,7 @@ hpux9* | hpux10* | hpux11*) ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -10727,7 +10821,7 @@ irix5* | irix6* | nonstopux*) nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -10764,9 +10858,9 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -10852,7 +10946,7 @@ netbsd*) ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -10921,7 +11015,7 @@ rdos*) ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -10946,7 +11040,7 @@ sunos4*) ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -10970,7 +11064,7 @@ sysv4 | sysv4.3*) sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -11001,7 +11095,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11011,7 +11105,7 @@ tpf*) ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -11793,6 +11887,8 @@ CC="$lt_save_CC" + + ac_config_commands="$ac_config_commands libtool" @@ -11805,24 +11901,29 @@ CC="$lt_save_CC" # Honor aclocal flags ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" + JSON_MAJOR_VERSION=0 -JSON_MINOR_VERSION=14 +JSON_MINOR_VERSION=15 JSON_MICRO_VERSION=2 -JSON_VERSION=0.14.2 -JSON_RELEASE_STATUS=release +JSON_VERSION=0.15.2 +JSON_RELEASE_STATUS=snapshot -JSON_LT_CURRENT=1400 -JSON_LT_REVISION=2 -JSON_LT_AGE=1400 +JSON_LT_CURRENT=1502 +JSON_LT_REVISION=0 +JSON_LT_AGE=1502 JSON_LT_VERSION="$JSON_LT_CURRENT:$JSON_LT_REVISION:$JSON_LT_AGE" JSON_LT_LDFLAGS="-version-info $JSON_LT_VERSION" +platform_linux=no +platform_win32=no + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if building for some Win32 platform" >&5 $as_echo_n "checking if building for some Win32 platform... " >&6; } case $host in #( @@ -11831,13 +11932,35 @@ case $host in #( JSON_LT_LDFLAGS="$JSON_LT_LDFLAGS -no-undefined" platform_win32=yes ;; #( + *-*-linux*) : + + platform_linux=yes + ;; #( *) : - platform_win32=no + ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $platform_win32" >&5 $as_echo "$platform_win32" >&6; } + if test "$platform_linux" = "yes"; then + OS_LINUX_TRUE= + OS_LINUX_FALSE='#' +else + OS_LINUX_TRUE='#' + OS_LINUX_FALSE= +fi + + if test "$platform_win32" = "yes"; then + OS_WIN32_TRUE= + OS_WIN32_FALSE='#' +else + OS_WIN32_TRUE='#' + OS_WIN32_FALSE= +fi + + + GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" @@ -11852,12 +11975,12 @@ if test -n "$JSON_CFLAGS"; then pkg_cv_JSON_CFLAGS="$JSON_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= 2.26 gio-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= 2.26 gio-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= 2.31.0 gio-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= 2.31.0 gio-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_JSON_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0 >= 2.26 gio-2.0" 2>/dev/null` + pkg_cv_JSON_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0 >= 2.31.0 gio-2.0" 2>/dev/null` else pkg_failed=yes fi @@ -11868,12 +11991,12 @@ if test -n "$JSON_LIBS"; then pkg_cv_JSON_LIBS="$JSON_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= 2.26 gio-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= 2.26 gio-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= 2.31.0 gio-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= 2.31.0 gio-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_JSON_LIBS=`$PKG_CONFIG --libs "gobject-2.0 >= 2.26 gio-2.0" 2>/dev/null` + pkg_cv_JSON_LIBS=`$PKG_CONFIG --libs "gobject-2.0 >= 2.31.0 gio-2.0" 2>/dev/null` else pkg_failed=yes fi @@ -11893,14 +12016,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - JSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-2.0 >= 2.26 gio-2.0" 2>&1` + JSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-2.0 >= 2.31.0 gio-2.0" 2>&1` else - JSON_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-2.0 >= 2.26 gio-2.0" 2>&1` + JSON_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-2.0 >= 2.31.0 gio-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$JSON_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gobject-2.0 >= 2.26 gio-2.0) were not met: + as_fn_error $? "Package requirements (gobject-2.0 >= 2.31.0 gio-2.0) were not met: $JSON_PKG_ERRORS @@ -11935,8 +12058,6 @@ $as_echo "yes" >&6; } fi - - if test "x$enable_glibtest" = "xyes"; then ENABLE_GLIB_TEST_TRUE= ENABLE_GLIB_TEST_FALSE='#' @@ -11953,7 +12074,7 @@ fi if test "${enable_debug+set}" = set; then : enableval=$enable_debug; else - enable_debug=minimum + enable_debug=yes fi @@ -11985,7 +12106,7 @@ esac if test "${enable_maintainer_flags+set}" = set; then : enableval=$enable_maintainer_flags; else - enable_maintainer_flags=no + enable_maintainer_flags=yes fi @@ -12044,36 +12165,209 @@ fi MAINTAINER_CFLAGS="${MAINTAINER_CFLAGS#* }" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with gcov testing" >&5 -$as_echo_n "checking whether to build with gcov testing... " >&6; } + # Check whether --enable-gcov was given. if test "${enable_gcov+set}" = set; then : - enableval=$enable_gcov; + enableval=$enable_gcov; use_gcov=$enableval +else + use_gcov=no +fi + + +if test "x$use_gcov" = "xyes"; then : + + if test "$GCC" != "yes"; then : + as_fn_error $? "GCC is required for --enable-gcov" "$LINENO" 5 +fi + + # Extract the first word of "shtool", so it can be a program name with args. +set dummy shtool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_SHTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$SHTOOL"; then + ac_cv_prog_SHTOOL="$SHTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_SHTOOL="shtool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +SHTOOL=$ac_cv_prog_SHTOOL +if test -n "$SHTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHTOOL" >&5 +$as_echo "$SHTOOL" >&6; } else - enable_gcov=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -if test "x$enable_gcov" = "xyes" && test "x$GCC" = "xyes"; then : + case `$SHTOOL path $CC` in #( + *ccache*) : + gcc_ccache=yes ;; #( + *) : + gcc_ccache=no ;; +esac - GCOV_CFLAGS="$CFLAGS -O0 -g -fprofile-arcs -ftest-coverage" - GCOV_LDFLAGS="$LDFLAGS -lgcov" + if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then + as_fn_error $? "ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1." "$LINENO" 5 + fi + ltp_version_list="1.6 1.7 1.8 1.9" + # Extract the first word of "lcov", so it can be a program name with args. +set dummy lcov; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LTP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$LTP"; then + ac_cv_prog_LTP="$LTP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LTP="lcov" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS fi +fi +LTP=$ac_cv_prog_LTP +if test -n "$LTP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LTP" >&5 +$as_echo "$LTP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + - if test "x$enable_gcov" = "xyes"; then - GCOV_ENABLED_TRUE= - GCOV_ENABLED_FALSE='#' + # Extract the first word of "genhtml", so it can be a program name with args. +set dummy genhtml; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LTP_GENHTML+:} false; then : + $as_echo_n "(cached) " >&6 else - GCOV_ENABLED_TRUE='#' - GCOV_ENABLED_FALSE= + if test -n "$LTP_GENHTML"; then + ac_cv_prog_LTP_GENHTML="$LTP_GENHTML" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LTP_GENHTML="genhtml" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi fi +LTP_GENHTML=$ac_cv_prog_LTP_GENHTML +if test -n "$LTP_GENHTML"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LTP_GENHTML" >&5 +$as_echo "$LTP_GENHTML" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + if test "$LTP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ltp version" >&5 +$as_echo_n "checking for ltp version... " >&6; } +if ${json_cv_ltp_version+:} false; then : + $as_echo_n "(cached) " >&6 +else + + json_cv_ltp_version=invalid + ltp_version=`$LTP -v 2>/dev/null | $SED -e 's/^.* //'` + for ltp_check_version in $ltp_version_list; do + if test "$ltp_version" = "$ltp_check_version"; then + json_cv_ltp_version="$ltp_check_version (ok)" + fi + done + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $json_cv_ltp_version" >&5 +$as_echo "$json_cv_ltp_version" >&6; } + else + ltp_msg="To enable code coverage reporting you must have one of the following LTP versions installed: $ltp_version_list" + as_fn_error $? "$ltp_msg" "$LINENO" 5 + fi + + case $json_cv_ltp_version in + ""|invalid) + ltp_msg="You must have one of the following versions of LTP: $ltp_version_list (found: $ltp_version)." + as_fn_error $? "$ltp_msg" "$LINENO" 5 + LTP="exit 0;" + ;; + esac + + if test -z "$LTP_GENHTML"; then + as_fn_error $? "Could not find genhtml from the LTP package" "$LINENO" 5 + fi + + +$as_echo "#define HAVE_GCOV 1" >>confdefs.h + + CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'` + JSON_CFLAGS=`echo "$JSON_CFLAGS" | $SED -e 's/-O[0-9]*//g'` + + + JSON_GCOV_CFLAGS="-O0 -fprofile-arcs -ftest-coverage" + JSON_GCOV_LDADD="-lgcov" + + + + + JSON_CFLAGS="$JSON_CFLAGS $CLUTTER_GCOV_CFLAGS" + JSON_LIBS="$JSON_LIBS $CLUTTER_GCOV_LDADD" + +fi + + if test "x$use_gcov" = "xyes"; then + ENABLE_GCOV_TRUE= + ENABLE_GCOV_FALSE='#' +else + ENABLE_GCOV_TRUE='#' + ENABLE_GCOV_FALSE= +fi + -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gcov" >&5 -$as_echo "$enable_gcov" >&6; } @@ -12400,6 +12694,7 @@ fi + # Check whether --enable-introspection was given. if test "${enable_introspection+set}" = set; then : enableval=$enable_introspection; @@ -12493,6 +12788,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 $as_echo_n "checking whether NLS is requested... " >&6; } # Check whether --enable-nls was given. @@ -14541,6 +14837,10 @@ $as_echo_n "checking for linguas... " >&6; } $as_echo "$ALL_LINGUAS" >&6; } + + + + ac_config_files="$ac_config_files Makefile build/Makefile build/autotools/Makefile build/win32/Makefile build/win32/config.h.win32 build/win32/vs9/Makefile build/win32/vs10/Makefile json-glib/Makefile json-glib/json-version.h json-glib/tests/Makefile doc/Makefile doc/reference/Makefile doc/reference/version.xml po/Makefile.in json-glib.pc" @@ -14669,12 +14969,20 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${OS_LINUX_TRUE}" && test -z "${OS_LINUX_FALSE}"; then + as_fn_error $? "conditional \"OS_LINUX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then + as_fn_error $? "conditional \"OS_WIN32\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_GLIB_TEST_TRUE}" && test -z "${ENABLE_GLIB_TEST_FALSE}"; then as_fn_error $? "conditional \"ENABLE_GLIB_TEST\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${GCOV_ENABLED_TRUE}" && test -z "${GCOV_ENABLED_FALSE}"; then - as_fn_error $? "conditional \"GCOV_ENABLED\" was never defined. +if test -z "${ENABLE_GCOV_TRUE}" && test -z "${ENABLE_GCOV_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_GCOV\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then @@ -15110,7 +15418,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by json-glib $as_me 0.14.2, which was +This file was extended by json-glib $as_me 0.15.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15177,7 +15485,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -json-glib config.status 0.14.2 +json-glib config.status 0.15.2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -15314,6 +15622,7 @@ pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -15396,7 +15705,6 @@ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -15452,6 +15760,7 @@ _LTECHO_EOF' # Quote evaled strings. for var in SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -15502,7 +15811,6 @@ with_gnu_ld \ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ exclude_expsyms \ include_expsyms \ @@ -16320,8 +16628,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -16375,6 +16683,9 @@ SHELL=$lt_SHELL # An echo program that protects backslashes. ECHO=$lt_ECHO +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -16676,10 +16987,6 @@ no_undefined_flag=$lt_no_undefined_flag # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -17095,5 +17402,5 @@ echo " • API reference: ${enable_gtk_doc}" echo "" echo " • Enable test suite: ${enable_glibtest}" echo " • Build introspection data: ${enable_introspection}" -echo " • Enable coverage test: ${enable_gcov}" +echo " • Enable test coverage: ${use_gcov}" echo "" diff --git a/configure.ac b/configure.ac index 9b96143..be64660 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # bump micro_version to the next even number for each point release # bump micro_version to the next odd number after each release m4_define([json_major_version], [0]) -m4_define([json_minor_version], [14]) +m4_define([json_minor_version], [15]) m4_define([json_micro_version], [2]) m4_define([json_version], [json_major_version.json_minor_version.json_micro_version]) @@ -13,14 +13,14 @@ m4_define([json_release_status], # bump up by 1 for every micro release with no API changes, otherwise # set to 0. after release, bump up by 1 -m4_define([json_interface_age], [2]) +m4_define([json_interface_age], [0]) m4_define([json_binary_age], [m4_eval(100 * json_minor_version + json_micro_version)]) m4_define([lt_current], [m4_eval(100 * json_minor_version + json_micro_version - json_interface_age)]) m4_define([lt_revision], [json_interface_age]) m4_define([lt_age], [m4_eval(json_binary_age - json_interface_age)]) -m4_define([glib_req_version], [2.26]) +m4_define([glib_req_version], [2.31.0]) AC_PREREQ([2.63]) @@ -47,6 +47,8 @@ LT_INIT([disable-static]) # Honor aclocal flags ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" +dnl === Versioning ============================================================ + JSON_MAJOR_VERSION=json_major_version JSON_MINOR_VERSION=json_minor_version JSON_MICRO_VERSION=json_micro_version @@ -64,6 +66,11 @@ JSON_LT_AGE=lt_age JSON_LT_VERSION="$JSON_LT_CURRENT:$JSON_LT_REVISION:$JSON_LT_AGE" JSON_LT_LDFLAGS="-version-info $JSON_LT_VERSION" +dnl === Platform checks ======================================================= + +platform_linux=no +platform_win32=no + AC_CANONICAL_HOST AC_MSG_CHECKING([if building for some Win32 platform]) AS_CASE([$host], @@ -74,22 +81,30 @@ AS_CASE([$host], platform_win32=yes ], - [platform_win32=no] + [*-*-linux*], + [ + platform_linux=yes + ], + + [] ) AC_MSG_RESULT([$platform_win32]) +AM_CONDITIONAL(OS_LINUX, [test "$platform_linux" = "yes"]) +AM_CONDITIONAL(OS_WIN32, [test "$platform_win32" = "yes"]) + AC_SUBST(JSON_LT_LDFLAGS) +dnl === Dependencies ========================================================== + GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" AC_SUBST(GLIB_PREFIX) PKG_CHECK_MODULES(JSON, [gobject-2.0 >= glib_req_version gio-2.0]) -AC_SUBST(JSON_CFLAGS) -AC_SUBST(JSON_LIBS) AM_CONDITIONAL(ENABLE_GLIB_TEST, [test "x$enable_glibtest" = "xyes"]) -dnl = Enable debug level ====================================================== +dnl === Enable debug level ==================================================== m4_define([debug_default], [m4_if(m4_eval(json_minor_version % 2), [1], [yes], [minimum])]) @@ -122,7 +137,7 @@ AS_CASE([$enable_debug], AC_SUBST(JSON_DEBUG_CFLAGS) -dnl = Enable strict compiler flags ============================================ +dnl === Enable strict compiler flags ========================================== # use strict compiler flags only on development releases m4_define([maintainer_flags_default], [m4_if(m4_eval(json_minor_version % 2), [1], [yes], [no])]) @@ -145,30 +160,91 @@ AS_IF([test "x$enable_maintainer_flags" = "xyes" && test "x$GCC" = "xyes"], MAINTAINER_CFLAGS="${MAINTAINER_CFLAGS#* }" AC_SUBST([MAINTAINER_CFLAGS]) -dnl = GCOV coverage checks ==================================================== -AC_MSG_CHECKING([whether to build with gcov testing]) +dnl === Test coverage ========================================================= + AC_ARG_ENABLE([gcov], - [AS_HELP_STRING([--enable-gcov], - [Whether to enable coverage testing (requires gcc and gcov)])], - [], - [enable_gcov=no]) + [AS_HELP_STRING([--enable-gcov], [Enable gcov])], + [use_gcov=$enableval], + [use_gcov=no]) -AS_IF([test "x$enable_gcov" = "xyes" && test "x$GCC" = "xyes"], +AS_IF([test "x$use_gcov" = "xyes"], [ - GCOV_CFLAGS="$CFLAGS -O0 -g -fprofile-arcs -ftest-coverage" - GCOV_LDFLAGS="$LDFLAGS -lgcov" - ] -) - -AM_CONDITIONAL([GCOV_ENABLED], [test "x$enable_gcov" = "xyes"]) -AC_SUBST([GCOV_CFLAGS]) -AC_SUBST([GCOV_LDFLAGS]) -AC_MSG_RESULT([$enable_gcov]) + dnl we need gcc: + AS_IF([test "$GCC" != "yes"], [AC_MSG_ERROR([GCC is required for --enable-gcov])]) + + dnl Check if ccache is being used + AC_CHECK_PROG(SHTOOL, shtool, shtool) + AS_CASE([`$SHTOOL path $CC`], + [*ccache*], [gcc_ccache=yes], + [gcc_ccache=no]) + + if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then + AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.]) + fi + + ltp_version_list="1.6 1.7 1.8 1.9" + AC_CHECK_PROG(LTP, lcov, lcov) + AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml) + + if test "$LTP"; then + AC_CACHE_CHECK([for ltp version], json_cv_ltp_version, + [ + json_cv_ltp_version=invalid + ltp_version=`$LTP -v 2>/dev/null | $SED -e 's/^.* //'` + for ltp_check_version in $ltp_version_list; do + if test "$ltp_version" = "$ltp_check_version"; then + json_cv_ltp_version="$ltp_check_version (ok)" + fi + done + ]) + else + ltp_msg="To enable code coverage reporting you must have one of the following LTP versions installed: $ltp_version_list" + AC_MSG_ERROR([$ltp_msg]) + fi + + case $json_cv_ltp_version in + ""|invalid[)] + ltp_msg="You must have one of the following versions of LTP: $ltp_version_list (found: $ltp_version)." + AC_MSG_ERROR([$ltp_msg]) + LTP="exit 0;" + ;; + esac + + if test -z "$LTP_GENHTML"; then + AC_MSG_ERROR([Could not find genhtml from the LTP package]) + fi + + AC_DEFINE(HAVE_GCOV, 1, [Whether you have gcov]) + + dnl Remove all optimization flags from CFLAGS + changequote({,}) + CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'` + JSON_CFLAGS=`echo "$JSON_CFLAGS" | $SED -e 's/-O[0-9]*//g'` + changequote([,]) + + dnl Define the special gcc flags + JSON_GCOV_CFLAGS="-O0 -fprofile-arcs -ftest-coverage" + JSON_GCOV_LDADD="-lgcov" + + AC_SUBST(JSON_GCOV_CFLAGS) + AC_SUBST(JSON_GCOV_LDADD) + + JSON_CFLAGS="$JSON_CFLAGS $CLUTTER_GCOV_CFLAGS" + JSON_LIBS="$JSON_LIBS $CLUTTER_GCOV_LDADD" + ]) + +AM_CONDITIONAL(ENABLE_GCOV, test "x$use_gcov" = "xyes") + +dnl === Documentation ========================================================= GTK_DOC_CHECK([1.13], [--flavour no-tmpl]) +dnl === Introspection ========================================================= + GOBJECT_INTROSPECTION_CHECK([0.9.5]) +dnl === Localization ========================================================== + AM_GNU_GETTEXT_VERSION([0.18]) AM_GNU_GETTEXT([external]) @@ -179,6 +255,11 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], [The prefix for our gettext translation domains.]) AS_ALL_LINGUAS +dnl === Output ================================================================ + +AC_SUBST(JSON_CFLAGS) +AC_SUBST(JSON_LIBS) + AC_CONFIG_FILES([ Makefile @@ -218,5 +299,5 @@ echo " • API reference: ${enable_gtk_doc}" echo "" echo " • Enable test suite: ${enable_glibtest}" echo " • Build introspection data: ${enable_introspection}" -echo " • Enable coverage test: ${enable_gcov}" +echo " • Enable test coverage: ${use_gcov}" echo "" diff --git a/doc/Makefile.in b/doc/Makefile.in index 74667ee..52ee247 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -62,11 +62,11 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -137,11 +137,10 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCOV_CFLAGS = @GCOV_CFLAGS@ -GCOV_LDFLAGS = @GCOV_LDFLAGS@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -173,6 +172,8 @@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ JSON_CFLAGS = @JSON_CFLAGS@ JSON_DEBUG_CFLAGS = @JSON_DEBUG_CFLAGS@ +JSON_GCOV_CFLAGS = @JSON_GCOV_CFLAGS@ +JSON_GCOV_LDADD = @JSON_GCOV_LDADD@ JSON_LIBS = @JSON_LIBS@ JSON_LT_LDFLAGS = @JSON_LT_LDFLAGS@ JSON_MAJOR_VERSION = @JSON_MAJOR_VERSION@ @@ -192,6 +193,8 @@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LTP = @LTP@ +LTP_GENHTML = @LTP_GENHTML@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -221,6 +224,7 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -529,10 +533,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff --git a/doc/reference/Makefile.in b/doc/reference/Makefile.in index 4aa1ae7..e62d0f3 100644 --- a/doc/reference/Makefile.in +++ b/doc/reference/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -74,11 +74,11 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version.xml CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -109,11 +109,10 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCOV_CFLAGS = @GCOV_CFLAGS@ -GCOV_LDFLAGS = @GCOV_LDFLAGS@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -145,6 +144,8 @@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ JSON_CFLAGS = @JSON_CFLAGS@ JSON_DEBUG_CFLAGS = @JSON_DEBUG_CFLAGS@ +JSON_GCOV_CFLAGS = @JSON_GCOV_CFLAGS@ +JSON_GCOV_LDADD = @JSON_GCOV_LDADD@ JSON_LIBS = @JSON_LIBS@ JSON_LT_LDFLAGS = @JSON_LT_LDFLAGS@ JSON_MAJOR_VERSION = @JSON_MAJOR_VERSION@ @@ -164,6 +165,8 @@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LTP = @LTP@ +LTP_GENHTML = @LTP_GENHTML@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -193,6 +196,7 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -398,6 +402,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/gtk-doc.make: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -470,10 +475,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -715,7 +725,7 @@ distclean-local: rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ fi -maintainer-clean-local: clean +maintainer-clean-local: @rm -rf xml html install-data-local: @@ -751,7 +761,7 @@ uninstall-local: # # Require gtk-doc when making dist # -@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: +@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs @ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: @ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" @ENABLE_GTK_DOC_FALSE@ @false diff --git a/doc/reference/html/JsonBuilder.html b/doc/reference/html/JsonBuilder.html index f58db89..7921843 100644 --- a/doc/reference/html/JsonBuilder.html +++ b/doc/reference/html/JsonBuilder.html @@ -145,7 +145,7 @@ Returns the root of the current constructed tree, if the build is complete

Returns :

-the JsonNode, or NULL if the build is not complete. +the JsonNode, or NULL if the build is not complete. Free the returned value with json_node_free(). [transfer full] @@ -190,7 +190,7 @@ or an array element.

Returns :

-the JsonBuilder, or NULL if the call was inconsistent. [transfer none] +the JsonBuilder, or NULL if the call was inconsistent. [transfer none] @@ -217,7 +217,7 @@ Cannot be called after Returns :

-the JsonBuilder, or NULL if the call was inconsistent. [transfer none] +the JsonBuilder, or NULL if the call was inconsistent. [transfer none] @@ -245,7 +245,7 @@ or an array element.

Returns :

-the JsonBuilder, or NULL if the call was inconsistent. [transfer none] +the JsonBuilder, or NULL if the call was inconsistent. [transfer none] @@ -277,7 +277,7 @@ Can be called only if the call is associated to an object.

Returns :

-the JsonBuilder, or NULL if the call was inconsistent. [transfer none] +the JsonBuilder, or NULL if the call was inconsistent. [transfer none] @@ -304,7 +304,7 @@ Cannot be called after Returns :

-the JsonBuilder, or NULL if the call was inconsistent. [transfer none] +the JsonBuilder, or NULL if the call was inconsistent. [transfer none] @@ -334,7 +334,7 @@ recent opened array.

Returns :

-the JsonBuilder, or NULL if the call was inconsistent. [transfer none] +the JsonBuilder, or NULL if the call was inconsistent. [transfer none] @@ -367,7 +367,7 @@ See also: Returns :

-the JsonBuilder, or NULL if the call was inconsistent. [transfer none] +the JsonBuilder, or NULL if the call was inconsistent. [transfer none] @@ -400,7 +400,7 @@ See also: Returns :

-the JsonBuilder, or NULL if the call was inconsistent. [transfer none] +the JsonBuilder, or NULL if the call was inconsistent. [transfer none] @@ -433,7 +433,7 @@ See also: Returns :

-the JsonBuilder, or NULL if the call was inconsistent. [transfer none] +the JsonBuilder, or NULL if the call was inconsistent. [transfer none] @@ -466,7 +466,7 @@ See also: Returns :

-the JsonBuilder, or NULL if the call was inconsistent. [transfer none] +the JsonBuilder, or NULL if the call was inconsistent. [transfer none] @@ -494,7 +494,7 @@ See also: Returns :

-the JsonBuilder, or NULL if the call was inconsistent. [transfer none] +the JsonBuilder, or NULL if the call was inconsistent. [transfer none] diff --git a/doc/reference/html/JsonGenerator.html b/doc/reference/html/JsonGenerator.html index e0c2774..306c88b 100644 --- a/doc/reference/html/JsonGenerator.html +++ b/doc/reference/html/JsonGenerator.html @@ -178,7 +178,7 @@ Retrieves a pointer to the root Returns :

-a JsonNode, or NULL. The returned node +a JsonNode, or NULL. The returned node is owned by the JsonGenerator and it should not be freed. [transfer none] @@ -356,7 +356,7 @@ current file contents. This operation is atomic.

error :

-return location for a GError, or NULL +return location for a GError, or NULL @@ -387,7 +387,7 @@ buffer.

length :

return location for the length of the returned -buffer, or NULL. [out] +buffer, or NULL. [out] @@ -423,12 +423,12 @@ Outputs JSON data and streams it (synchronously) to

cancellable :

-a GCancellable, or NULL. [allow-none] +a GCancellable, or NULL. [allow-none]

error :

-return location for a GError, or NULL +return location for a GError, or NULL diff --git a/doc/reference/html/JsonParser.html b/doc/reference/html/JsonParser.html index 7045fd7..afe3b9f 100644 --- a/doc/reference/html/JsonParser.html +++ b/doc/reference/html/JsonParser.html @@ -280,7 +280,7 @@ Loads a JSON stream from the content of filename

error :

-return location for a GError, or NULL +return location for a GError, or NULL @@ -322,7 +322,7 @@ parser will be destroyed each time.

error :

-return location for a GError, or NULL +return location for a GError, or NULL @@ -345,7 +345,7 @@ of error, error is set accordingly and < Loads the contents of an input stream and parses them.

-If cancellable is not NULL, then the operation can be cancelled by +If cancellable is not NULL, then the operation can be cancelled by triggering the cancellable object from another thread. If the operation was cancelled, the error G_IO_ERROR_CANCELLED will be set on the passed error. @@ -365,12 +365,12 @@ on the passed error.

cancellable :

-a GCancellable, or NULL. [allow-none] +a GCancellable, or NULL. [allow-none]

error :

-the return location for a GError, or NULL +the return location for a GError, or NULL @@ -418,7 +418,7 @@ of the operation.

cancellable :

-a GCancellable, or NULL. [allow-none] +a GCancellable, or NULL. [allow-none] @@ -459,7 +459,7 @@ Finishes an asynchronous stream loading started with

error :

-the return location for a GError or NULL +the return location for a GError or NULL @@ -596,14 +596,14 @@ used.

variable_name :

Return location for the variable -name, or NULL. [out][allow-none][transfer none] +name, or NULL. [out][allow-none][transfer none]

Returns :

TRUE if there was an assignment, FALSE otherwise. If -variable_name is not NULL it will be set to the name of the variable +variable_name is not NULL it will be set to the name of the variable used in the assignment. The string is owned by JsonParser and should never be modified or freed. diff --git a/doc/reference/html/JsonPath.html b/doc/reference/html/JsonPath.html index a59015a..24c3858 100644 --- a/doc/reference/html/JsonPath.html +++ b/doc/reference/html/JsonPath.html @@ -362,7 +362,7 @@ A JSONPath expression must be compiled before calling error :

-return location for a GError, or NULL +return location for a GError, or NULL @@ -441,7 +441,7 @@ matches it against the JSON tree pointed by root

error :

-return location for a GError, or NULL +return location for a GError, or NULL diff --git a/doc/reference/html/JsonReader.html b/doc/reference/html/JsonReader.html index eee8c78..dd35c96 100644 --- a/doc/reference/html/JsonReader.html +++ b/doc/reference/html/JsonReader.html @@ -208,7 +208,7 @@ the JSON tree starting from node

node :

-a JsonNode, or NULL. [allow-none] +a JsonNode, or NULL. [allow-none] @@ -583,7 +583,7 @@ is positioned on an object.

Returns :

-a newly allocated, NULL-terminated +a newly allocated, NULL-terminated array of strings holding the members name. Use g_strfreev() when done. [transfer full] @@ -609,7 +609,7 @@ Retrieves the name of the current member.

Returns :

-the name of the member, or NULL. [transfer none] +the name of the member, or NULL. [transfer none] @@ -658,7 +658,7 @@ Retrieves the Returns :

-a JsonNode, or NULL. The returned node +a JsonNode, or NULL. The returned node is owned by the JsonReader and it should not be modified or freed directly. [transfer none] @@ -871,7 +871,7 @@ is in error state

Returns :

-the pointer to the error, or NULL. [transfer none] +the pointer to the error, or NULL. [transfer none] diff --git a/doc/reference/html/ch01.html b/doc/reference/html/ch01.html index 1d46c07..d532e08 100644 --- a/doc/reference/html/ch01.html +++ b/doc/reference/html/ch01.html @@ -21,7 +21,7 @@

-Data Types

+Data Types
JSON Node — Node in a JSON object model diff --git a/doc/reference/html/ch02.html b/doc/reference/html/ch02.html index 14a5ca9..c3dc2c5 100644 --- a/doc/reference/html/ch02.html +++ b/doc/reference/html/ch02.html @@ -21,7 +21,7 @@

-Parser

+Parser
JsonParser — Parse JSON data streams diff --git a/doc/reference/html/ch03.html b/doc/reference/html/ch03.html index 0d1373e..ac8fd3f 100644 --- a/doc/reference/html/ch03.html +++ b/doc/reference/html/ch03.html @@ -21,7 +21,7 @@

-Generator

+Generator
JsonGenerator — Generates JSON data streams diff --git a/doc/reference/html/ch04.html b/doc/reference/html/ch04.html index a404901..19df291 100644 --- a/doc/reference/html/ch04.html +++ b/doc/reference/html/ch04.html @@ -21,7 +21,7 @@

-Object Hierarchy

+Object Hierarchy
     GObject
         JsonBuilder
diff --git a/doc/reference/html/index.html b/doc/reference/html/index.html
index 25122f3..6af9590 100644
--- a/doc/reference/html/index.html
+++ b/doc/reference/html/index.html
@@ -14,12 +14,12 @@
 

 

 

-
for JSON-GLib 0.14.2
+
for JSON-GLib 0.15.2
 

 
Copyright © 2007, 2008 OpenedHand LTD

 
Copyright © 2009, 2010, 2011 Intel Corporation

 

-

+

         Permission is granted to copy, distribute and/or modify this
         document under the terms of the GNU Free
         Documentation License, Version 1.1 or any later
diff --git a/doc/reference/html/ix01.html b/doc/reference/html/ix01.html
index 2c88edf..d07d4bd 100644
--- a/doc/reference/html/ix01.html
+++ b/doc/reference/html/ix01.html
@@ -46,7 +46,7 @@
 
 

 

-Index

+Index

 
A

 

 JsonArray, struct in JSON Array
diff --git a/doc/reference/html/ix02.html b/doc/reference/html/ix02.html
index 7a39139..f8ddab3 100644
--- a/doc/reference/html/ix02.html
+++ b/doc/reference/html/ix02.html
@@ -30,7 +30,7 @@
 
 

 

-Index of deprecated symbols

+Index of deprecated symbols

 
C

 

 json_construct_gobject, function in GObject Serialization
diff --git a/doc/reference/html/ix03.html b/doc/reference/html/ix03.html
index e5a596e..af9b66b 100644
--- a/doc/reference/html/ix03.html
+++ b/doc/reference/html/ix03.html
@@ -32,7 +32,7 @@
 
 

 

-Index of new symbols in 0.4

+Index of new symbols in 0.4

 
C

 

 json_construct_gobject, function in GObject Serialization
diff --git a/doc/reference/html/ix04.html b/doc/reference/html/ix04.html
index c791817..5da8a4a 100644
--- a/doc/reference/html/ix04.html
+++ b/doc/reference/html/ix04.html
@@ -30,7 +30,7 @@
 
 

 

-Index of new symbols in 0.6

+Index of new symbols in 0.6

 
A

 

 json_array_dup_element, function in JSON Array
diff --git a/doc/reference/html/ix05.html b/doc/reference/html/ix05.html
index 83152d9..312b1b0 100644
--- a/doc/reference/html/ix05.html
+++ b/doc/reference/html/ix05.html
@@ -30,7 +30,7 @@
 
 

 

-Index of new symbols in 0.8

+Index of new symbols in 0.8

 
A

 

 JsonArrayForeach, user_function in JSON Array
diff --git a/doc/reference/html/ix06.html b/doc/reference/html/ix06.html
index d90279d..572a932 100644
--- a/doc/reference/html/ix06.html
+++ b/doc/reference/html/ix06.html
@@ -32,7 +32,7 @@
 
 

 

-Index of new symbols in 0.10

+Index of new symbols in 0.10

 
B

 

 JsonBoxedDeserializeFunc, user_function in Boxed Types Serialization
diff --git a/doc/reference/html/ix07.html b/doc/reference/html/ix07.html
index 88643ae..503ab92 100644
--- a/doc/reference/html/ix07.html
+++ b/doc/reference/html/ix07.html
@@ -32,7 +32,7 @@
 
 

 

-Index of new symbols in 0.12

+Index of new symbols in 0.12

 
B

 

 JsonBuilder, struct in JsonBuilder
diff --git a/doc/reference/html/ix08.html b/doc/reference/html/ix08.html
index 4e39672..b7dc23e 100644
--- a/doc/reference/html/ix08.html
+++ b/doc/reference/html/ix08.html
@@ -32,7 +32,7 @@
 
 

 

-Index of new symbols in 0.14

+Index of new symbols in 0.14

 
G

 

 json_generator_get_indent, function in JsonGenerator
diff --git a/doc/reference/html/json-glib-Boxed-Types-Serialization.html b/doc/reference/html/json-glib-Boxed-Types-Serialization.html
index 8089fd8..62aa163 100644
--- a/doc/reference/html/json-glib-Boxed-Types-Serialization.html
+++ b/doc/reference/html/json-glib-Boxed-Types-Serialization.html
@@ -335,7 +335,7 @@ into a 
 
Returns :

 a JsonNode with the serialization of the
-boxed type, or NULL if serialization either failed or was not possible. [transfer full]
+boxed type, or NULL if serialization either failed or was not possible. [transfer full]
 
 
 
diff --git a/doc/reference/html/json-glib-GObject-Serialization.html b/doc/reference/html/json-glib-GObject-Serialization.html
index 89d5d08..9514bd1 100644
--- a/doc/reference/html/json-glib-GObject-Serialization.html
+++ b/doc/reference/html/json-glib-GObject-Serialization.html
@@ -157,7 +157,7 @@ JSON native types.
 
 
 
length :

-return value for the length of the buffer, or NULL. [out]
+return value for the length of the buffer, or NULL. [out]
 
 
 
@@ -203,12 +203,12 @@ Note: the JSON data stream must be an object declaration.
 
 
 
error :

-return location for a GError, or NULL
+return location for a GError, or NULL
 
 
 
 
Returns :

-a GObject or NULL. [transfer full]
+a GObject or NULL. [transfer full]
 
 
 
@@ -253,12 +253,12 @@ Note: the JSON data stream must be an object declaration.
 
 
 
error :

-return location for a GError, or NULL
+return location for a GError, or NULL
 
 
 
 
Returns :

-a GObject or NULL. [transfer full]
+a GObject or NULL. [transfer full]
 
 
 
@@ -290,7 +290,7 @@ translate the compatible types into JSON native types.
 
 
 
length :

-return value for the length of the buffer, or NULL. [out]
+return value for the length of the buffer, or NULL. [out]
 
 
 
diff --git a/doc/reference/html/json-glib-JSON-GVariant-Integration.html b/doc/reference/html/json-glib-JSON-GVariant-Integration.html
index 8d4a742..9cad169 100644
--- a/doc/reference/html/json-glib-JSON-GVariant-Integration.html
+++ b/doc/reference/html/json-glib-JSON-GVariant-Integration.html
@@ -70,7 +70,7 @@ according to the following table:
 

 

 

-
Table 2. Default JSON to GVariant conversion (without signature constrains)

+
Table 2. Default JSON to GVariant conversion (without signature constrains)

 
@@ -160,7 +160,7 @@ JSON tree, and then length :

 
@@ -185,11 +185,11 @@ resolve ambiguous data types. If no error occurs, the resulting signature.
 

 

-If signature is not NULL but does not represent a valid GVariant type
-string, NULL is returned and error is set to G_IO_ERROR_INVALID_ARGUMENT.
+If signature is not NULL but does not represent a valid GVariant type
+string, NULL is returned and error is set to G_IO_ERROR_INVALID_ARGUMENT.
 If a signature is provided but the JSON structure cannot be mapped to it,
-NULL is returned and error is set to G_IO_ERROR_INVALID_DATA.
-If signature is NULL, the conversion is done based strictly on the types
+NULL is returned and error is set to G_IO_ERROR_INVALID_DATA.
+If signature is NULL, the conversion is done based strictly on the types
 in the JSON nodes.
 

 
 

Return location for the length of the returned
-string, or NULL. [out][allow-none]
+string, or NULL. [out][allow-none]
 
 

 

 

@@ -201,7 +201,7 @@ in the JSON nodes.
 
-
@@ -212,7 +212,7 @@ in the JSON nodes.
 
@@ -241,11 +241,11 @@ The string is first converted to a length :

-
+
-
@@ -256,7 +256,7 @@ The string is first converted to a Returns :

 
diff --git a/doc/reference/html/json-glib-JSON-Node.html b/doc/reference/html/json-glib-JSON-Node.html
index c4ccdbe..ec32944 100644
--- a/doc/reference/html/json-glib-JSON-Node.html
+++ b/doc/reference/html/json-glib-JSON-Node.html
@@ -826,7 +826,7 @@ Retrieves the parent 
 
-
@@ -912,7 +912,7 @@ Checks whether node is a 
 

 

-
Note
A null node is not the same as a NULLJsonNode
+
Note
A null node is not the same as a NULLJsonNode
 

 

diff --git a/doc/reference/html/json-glib-JSON-Object.html b/doc/reference/html/json-glib-JSON-Object.html
index 675882f..a27c18d 100644
--- a/doc/reference/html/json-glib-JSON-Object.html
+++ b/doc/reference/html/json-glib-JSON-Object.html
@@ -314,7 +314,7 @@ a Returns :

 
@@ -344,7 +344,7 @@ inside a Returns :

 
diff --git a/doc/reference/html/json-glib-Serializable-Interface.html b/doc/reference/html/json-glib-Serializable-Interface.html
index 61f6b32..9b08591 100644
--- a/doc/reference/html/json-glib-Serializable-Interface.html
+++ b/doc/reference/html/json-glib-Serializable-Interface.html
@@ -260,7 +260,7 @@ FIXME
 
diff --git a/doc/reference/html/json-glib-Versioning-information.html b/doc/reference/html/json-glib-Versioning-information.html
index 53a0f0a..146e92b 100644
--- a/doc/reference/html/json-glib-Versioning-information.html
+++ b/doc/reference/html/json-glib-Versioning-information.html
@@ -70,7 +70,7 @@ Json major version component (e.g. 1 if 
 
JSON_MINOR_VERSION

-
#define JSON_MINOR_VERSION              (14)
+
#define JSON_MINOR_VERSION              (15)
 

 

 Json minor version component (e.g. 2 if JSON_VERSION is 1.2.3)
@@ -88,7 +88,7 @@ Json micro version component (e.g. 3 if 
 
JSON_VERSION

-
#define JSON_VERSION                    (0.14.2)
+
#define JSON_VERSION                    (0.15.2)
 

 

 Json version.
@@ -97,7 +97,7 @@ Json version.
 

 

 
JSON_VERSION_S

-
#define JSON_VERSION_S                  "0.14.2"
+
#define JSON_VERSION_S                  "0.15.2"
 

 

 Json version, encoded as a string, useful for printing and
diff --git a/doc/reference/json-glib-sections.txt b/doc/reference/json-glib-sections.txt
index 1cb911a..b18ebe7 100644
--- a/doc/reference/json-glib-sections.txt
+++ b/doc/reference/json-glib-sections.txt
@@ -129,6 +129,8 @@ json_node_get_node_type
 json_node_is_null
 
 
+JSON_DEPRECATED
+JSON_DEPRECATED_FOR
 JSON_TYPE_NODE
 json_node_get_type
 
diff --git a/doc/reference/version.xml b/doc/reference/version.xml
index e867cc2..4312e0d 100644
--- a/doc/reference/version.xml
+++ b/doc/reference/version.xml
@@ -1 +1 @@
-0.14.2
+0.15.2
diff --git a/gtk-doc.make b/gtk-doc.make
index 9841de4..8ff8f21 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -200,7 +200,7 @@ distclean-local:
 	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
 	fi
 
-maintainer-clean-local: clean
+maintainer-clean-local:
 	@rm -rf xml html
 
 install-data-local:
@@ -237,7 +237,7 @@ uninstall-local:
 # Require gtk-doc when making dist
 #
 if ENABLE_GTK_DOC
-dist-check-gtkdoc:
+dist-check-gtkdoc: docs
 else
 dist-check-gtkdoc:
 	@echo "*** gtk-doc must be installed and enabled in order to make dist"
diff --git a/json-glib/Json-1.0.gir b/json-glib/Json-1.0.gir
index 7c11cf2..29fa40e 100644
--- a/json-glib/Json-1.0.gir
+++ b/json-glib/Json-1.0.gir
@@ -168,11 +168,9 @@ See also: json_array_add_element(), json_node_set_string()
               c:identifier="json_array_dup_element"
               version="0.6">
         Retrieves a copy of the #JsonNode containing the value of the
-element at @index_ inside a #JsonArray
-
-index. Use json_node_free() when done.
+element at @index_ inside a #JsonArray
         
-          a copy of the #JsonNode at the requested
+          a copy of the #JsonNode at the requested index. Use json_node_free() when done.
           
         
         
@@ -277,13 +275,9 @@ inside a #JsonArray.
         
       
       
-        Gets the elements of a #JsonArray as a list of #JsonNode<!-- -->s.
-
-containing the elements of the array. The contents of the list are
-owned by the array and should never be modified or freed. Use
-g_list_free() on the returned list when done using it
+        Gets the elements of a #JsonArray as a list of #JsonNode<!-- -->s.
         
-          a #GList
+          a #GList containing the elements of the array. The contents of the list are owned by the array and should never be modified or freed. Use g_list_free() on the returned list when done using it
           
             
           
@@ -355,11 +349,9 @@ See also: json_array_get_element(), json_node_get_object()
         Conveniently retrieves the string value of the element at @index_
 inside @array
 
-See also: json_array_get_element(), json_node_get_string()
-
-the #JsonArray and should not be modified or freed
+See also: json_array_get_element(), json_node_get_string()
         
-          the string value; the returned string is owned by
+          the string value; the returned string is owned by the #JsonArray and should not be modified or freed
           
         
         
@@ -370,11 +362,9 @@ the #JsonArray and should not be modified or freed
         
       
       
-        Increase by one the reference count of a #JsonArray.
-
-increased by one.
+        Increase by one the reference count of a #JsonArray.
         
-          the passed #JsonArray, with the reference count
+          the passed #JsonArray, with the reference count increased by one.
           
         
       
@@ -616,11 +606,9 @@ Cannot be called after json_builder_set_member_name().
       
       
         Returns the root of the current constructed tree, if the build is complete
-(ie: all opened objects, object members and arrays are being closed).
-
-Free the returned value with json_node_free().
+(ie: all opened objects, object members and arrays are being closed).
         
-          the #JsonNode, or %NULL if the build is not complete.
+          the #JsonNode, or %NULL if the build is not complete. Free the returned value with json_node_free().
           
         
       
@@ -719,11 +707,9 @@ JSON data stream starting from a data object model composed by
       
-        Retrieves the value set using json_generator_set_pretty().
-
-%FALSE otherwise
+        Retrieves the value set using json_generator_set_pretty().
         
-          %TRUE if the generated JSON should be pretty-printed, and
+          %TRUE if the generated JSON should be pretty-printed, and %FALSE otherwise
           
         
       
@@ -731,11 +717,9 @@ JSON data stream starting from a data object model composed by
               c:identifier="json_generator_get_root"
               version="0.14">
         Retrieves a pointer to the root #JsonNode set using
-json_generator_set_root().
-
-is owned by the #JsonGenerator and it should not be freed
+json_generator_set_root().
         
-          a #JsonNode, or %NULL. The returned node
+          a #JsonNode, or %NULL. The returned node is owned by the #JsonGenerator and it should not be freed
           
         
       
@@ -801,11 +785,9 @@ freed after calling this function.</note>
       
       
         Generates a JSON data stream from @generator and returns it as a
-buffer.
-
-Use g_free() to free the allocated resources.
+buffer.
         
-          a newly allocated buffer holding a JSON data stream.
+          a newly allocated buffer holding a JSON data stream. Use g_free() to free the allocated resources.
           
         
         
@@ -836,11 +818,9 @@ current file contents. This operation is atomic.
               c:identifier="json_generator_to_stream"
               version="0.12"
               throws="1">
-        Outputs JSON data and streams it (synchronously) to @stream.
-
-on failure. In case of error, the #GError will be filled accordingly
+        Outputs JSON data and streams it (synchronously) to @stream.
         
-          %TRUE if the write operation was successful, and %FALSE
+          %TRUE if the write operation was successful, and %FALSE on failure. In case of error, the #GError will be filled accordingly
           
         
         
@@ -959,11 +939,9 @@ count of the objects is increased.
       
       
         Retrieves the #JsonArray stored inside a #JsonNode and returns it
-with its reference count increased by one.
-
-count increased.
+with its reference count increased by one.
         
-          the #JsonArray with its reference
+          the #JsonArray with its reference count increased.
           
         
       
@@ -976,11 +954,9 @@ the returned object is increased.
         
       
       
-        Gets a copy of the string value stored inside a #JsonNode
-
-of the #JsonNode contents. Use g_free() to free the allocated resources
+        Gets a copy of the string value stored inside a #JsonNode
         
-          a newly allocated string containing a copy
+          a newly allocated string containing a copy of the #JsonNode contents. Use g_free() to free the allocated resources
           
         
       
@@ -1035,11 +1011,9 @@ of the #JsonNode contents. Use g_free() to free the allocated resources
         
       
       
-        Retrieves the parent #JsonNode of @node.
-
-the root node
+        Retrieves the parent #JsonNode of @node.
         
-          the parent node, or %NULL if @node is
+          the parent node, or %NULL if @node is the root node
           
         
       
@@ -1211,11 +1185,9 @@ content.
         
       
       
-        Retrieves the user readable name of the data type contained by @node.
-
-is owned by the node and should never be modified or freed
+        Retrieves the user readable name of the data type contained by @node.
         
-          a string containing the name of the type. The returned string
+          a string containing the name of the type. The returned string is owned by the node and should never be modified or freed
           
         
       
@@ -1268,11 +1240,9 @@ This function will return if the @object already contains a member
               c:identifier="json_object_dup_member"
               version="0.6">
         Retrieves a copy of the #JsonNode containing the value of @member_name
-inside a #JsonObject
-
-object member or %NULL. Use json_node_free() when done.
+inside a #JsonObject
         
-          a copy of the node for the requested
+          a copy of the node for the requested object member or %NULL. Use json_node_free() when done.
           
         
         
@@ -1382,11 +1352,9 @@ See also: json_object_get_member()
       
       
         Retrieves the #JsonNode containing the value of @member_name inside
-a #JsonObject.
-
-member, or %NULL
+a #JsonObject.
         
-          a pointer to the node for the requested object
+          a pointer to the node for the requested object member, or %NULL
           
         
         
@@ -1398,14 +1366,9 @@ member, or %NULL
       
       
         Retrieves all the names of the members of a #JsonObject. You can
-obtain the value for each member using json_object_get_member().
-
-of member names. The content of the list is owned by the #JsonObject
-and should never be modified or freed. When you have finished using
-the returned list, use g_list_free() to free the resources it has
-allocated.
+obtain the value for each member using json_object_get_member().
         
-          a #GList
+          a #GList of member names. The content of the list is owned by the #JsonObject and should never be modified or freed. When you have finished using the returned list, use g_list_free() to free the resources it has allocated.
           
             
           
@@ -1473,13 +1436,9 @@ See also: json_object_get_member()
         
       
       
-        Retrieves all the values of the members of a #JsonObject.
-
-#JsonNode<!-- -->s. The content of the list is owned by the #JsonObject
-and should never be modified or freed. When you have finished using the
-returned list, use g_list_free() to free the resources it has allocated.
+        Retrieves all the values of the members of a #JsonObject.
         
-          a #GList of
+          a #GList of #JsonNode<!-- -->s. The content of the list is owned by the #JsonObject and should never be modified or freed. When you have finished using the returned list, use g_list_free() to free the resources it has allocated.
           
             
           
@@ -1499,11 +1458,9 @@ returned list, use g_list_free() to free the resources it has allocated.
         
       
       
-        Increase by one the reference count of a #JsonObject.
-
-increased by one.
+        Increase by one the reference count of a #JsonObject.
         
-          the passed #JsonObject, with the reference count
+          the passed #JsonObject, with the reference count increased by one.
           
         
       
@@ -1735,11 +1692,9 @@ private and should only be accessed via the provided API.
       
         Creates a new #JsonParser instance. You can use the #JsonParser to
 load a JSON stream from either a file or a buffer and then walk the
-hierarchy using the data types API.
-
-to release all the memory it allocates.
+hierarchy using the data types API.
         
-          the newly created #JsonParser. Use g_object_unref()
+          the newly created #JsonParser. Use g_object_unref() to release all the memory it allocates.
           
         
       
@@ -1850,12 +1805,9 @@ yield 0.
         
       
       
-        Retrieves the top level node from the parsed JSON stream.
-
-node is owned by the #JsonParser and should never be modified
-or freed.
+        Retrieves the top level node from the parsed JSON stream.
         
-          the root #JsonNode . The returned
+          the root #JsonNode . The returned node is owned by the #JsonParser and should never be modified or freed.
           
         
       
@@ -1865,7 +1817,7 @@ or freed.
         A JSON data stream might sometimes contain an assignment, like:
 
 |[
-var _json_data = { "member_name" : [ ...
+  var _json_data = { "member_name" : [ ...
 ]|
 
 even though it would technically constitute a violation of the RFC.
@@ -1873,13 +1825,9 @@ even though it would technically constitute a violation of the RFC.
 #JsonParser will ignore the left hand identifier and parse the right
 hand value of the assignment. #JsonParser will record, though, the
 existence of the assignment in the data stream and the variable name
-used.
-
-@variable_name is not %NULL it will be set to the name of the variable
-used in the assignment. The string is owned by #JsonParser and should
-never be modified or freed.
+used.
         
-          %TRUE if there was an assignment, %FALSE otherwise. If
+          %TRUE if there was an assignment, %FALSE otherwise. If @variable_name is not %NULL it will be set to the name of the variable used in the assignment. The string is owned by #JsonParser and should never be modified or freed.
           
         
         
@@ -1898,11 +1846,9 @@ never be modified or freed.
               throws="1">
         Loads a JSON stream from a buffer and parses it. You can call this function
 multiple times with the same #JsonParser object, but the contents of the
-parser will be destroyed each time.
-
-of error, @error is set accordingly and %FALSE is returned
+parser will be destroyed each time.
         
-          %TRUE if the buffer was succesfully parser. In case
+          %TRUE if the buffer was succesfully parser. In case of error, @error is set accordingly and %FALSE is returned
           
         
         
@@ -1920,11 +1866,9 @@ of error, @error is set accordingly and %FALSE is returned
               c:identifier="json_parser_load_from_file"
               throws="1">
         Loads a JSON stream from the content of @filename and parses it. See
-json_parser_load_from_data().
-
-In case of error, @error is set accordingly and %FALSE is returned
+json_parser_load_from_data().
         
-          %TRUE if the file was successfully loaded and parsed.
+          %TRUE if the file was successfully loaded and parsed. In case of error, @error is set accordingly and %FALSE is returned
           
         
         
@@ -1943,11 +1887,9 @@ In case of error, @error is set accordingly and %FALSE is returned
 If @cancellable is not %NULL, then the operation can be cancelled by
 triggering the @cancellable object from another thread. If the
 operation was cancelled, the error %G_IO_ERROR_CANCELLED will be set
-on the passed @error.
-
-parsed, and %FALSE otherwise
+on the passed @error.
         
-          %TRUE if the data stream was successfully read and
+          %TRUE if the data stream was successfully read and parsed, and %FALSE otherwise
           
         
         
@@ -2007,12 +1949,9 @@ of the operation.
               version="0.12"
               throws="1">
         Finishes an asynchronous stream loading started with
-json_parser_load_from_stream_async().
-
-and parsed, and %FALSE otherwise. In case of error, the #GError will be
-filled accordingly.
+json_parser_load_from_stream_async().
         
-          %TRUE if the content of the stream was successfully retrieves
+          %TRUE if the content of the stream was successfully retrieves and parsed, and %FALSE otherwise. In case of error, the #GError will be filled accordingly.
           
         
         
@@ -2363,11 +2302,9 @@ API.
         Creates a new #JsonPath instance.
 
 Once created, the #JsonPath object should be used with json_path_compile()
-and json_path_match().
-
-g_object_unref() to free the allocated resources when done
+and json_path_match().
         
-          the newly created #JsonPath instance. Use
+          the newly created #JsonPath instance. Use g_object_unref() to free the allocated resources when done
           
         
       
@@ -2385,12 +2322,9 @@ g_object_unref() to free the allocated resources when done
 This function is a simple wrapper around json_path_new(),
 json_path_compile() and json_path_match(). It implicitly
 creates a #JsonPath instance, compiles @expression and
-matches it against the JSON tree pointed by @root.
-
-%JSON_NODE_ARRAY containing an array of matching #JsonNode<!-- -->s.
-Use json_node_free() when done
+matches it against the JSON tree pointed by @root.
         
-          a newly-created #JsonNode of type
+          a newly-created #JsonNode of type %JSON_NODE_ARRAY containing an array of matching #JsonNode<!-- -->s. Use json_node_free() when done
           
         
         
@@ -2410,12 +2344,9 @@ Use json_node_free() when done
               throws="1">
         Validates and decomposes @expression.
 
-A JSONPath expression must be compiled before calling json_path_match().
-
-the %JSON_PATH_ERROR domain and a code from the #JsonPathError
-enumeration, and %FALSE will be returned
+A JSONPath expression must be compiled before calling json_path_match().
         
-          %TRUE on success; on error, @error will be set with
+          %TRUE on success; on error, @error will be set with the %JSON_PATH_ERROR domain and a code from the #JsonPathError enumeration, and %FALSE will be returned
           
         
         
@@ -2430,12 +2361,9 @@ enumeration, and %FALSE will be returned
 into the #JsonPath.
 
 The matching #JsonNode<!-- -->s will be copied into a #JsonArray and
-returned wrapped in a #JsonNode.
-
-%JSON_NODE_ARRAY containing an array of matching #JsonNode<!-- -->s.
-Use json_node_free() when done
+returned wrapped in a #JsonNode.
         
-          a newly-created #JsonNode of type
+          a newly-created #JsonNode of type %JSON_NODE_ARRAY containing an array of matching #JsonNode<!-- -->s. Use json_node_free() when done
           
         
         
@@ -2472,11 +2400,9 @@ object class whose members cannot be directly accessed.
 private data and should only be accessed using the provided API
       
         Creates a new #JsonReader. You can use this object to read the contents of
-the JSON tree starting from @node
-
-release the allocated resources when done
+the JSON tree starting from @node
         
-          the newly created #JsonReader. Use g_object_unref() to
+          the newly created #JsonReader. Use g_object_unref() to release the allocated resources when done
           
         
         
@@ -2495,11 +2421,9 @@ release the allocated resources when done
               c:identifier="json_reader_count_elements"
               version="0.12">
         Counts the elements of the current position, if @reader is
-positioned on an array
-
-the #JsonReader is set in an error state
+positioned on an array
         
-          the number of elements, or -1. In case of failure
+          the number of elements, or -1. In case of failure the #JsonReader is set in an error state
           
         
       
@@ -2507,11 +2431,9 @@ the #JsonReader is set in an error state
               c:identifier="json_reader_count_members"
               version="0.12">
         Counts the members of the current position, if @reader is
-positioned on an object
-
-the #JsonReader is set in an error state
+positioned on an object
         
-          the number of members, or -1. In case of failure
+          the number of members, or -1. In case of failure the #JsonReader is set in an error state
           
         
       
@@ -2604,45 +2526,36 @@ is in error state
       
-        Retrieves the #JsonNode of the current position of @reader
-
-is owned by the #JsonReader and it should not be modified or freed
-directly
+        Retrieves the #JsonNode of the current position of @reader
         
-          a #JsonNode, or %NULL. The returned node
+          a #JsonNode, or %NULL. The returned node is owned by the #JsonReader and it should not be modified or freed directly
           
         
       
       
-        Checks whether the @reader is currently on an array
-
-otherwise
+        Checks whether the @reader is currently on an array
         
-          %TRUE if the #JsonReader is on an array, and %FALSE
+          %TRUE if the #JsonReader is on an array, and %FALSE otherwise
           
         
       
       
-        Checks whether the @reader is currently on an object
-
-otherwise
+        Checks whether the @reader is currently on an object
         
-          %TRUE if the #JsonReader is on an object, and %FALSE
+          %TRUE if the #JsonReader is on an object, and %FALSE otherwise
           
         
       
       
-        Checks whether the @reader is currently on a value
-
-otherwise
+        Checks whether the @reader is currently on a value
         
-          %TRUE if the #JsonReader is on a value, and %FALSE
+          %TRUE if the #JsonReader is on a value, and %FALSE otherwise
           
         
       
@@ -2650,12 +2563,9 @@ otherwise
               c:identifier="json_reader_list_members"
               version="0.14">
         Retrieves a list of member names from the current position, if @reader
-is positioned on an object.
-
-array of strings holding the members name. Use g_strfreev() when
-done.
+is positioned on an object.
         
-          a newly allocated, %NULL-terminated
+          a newly allocated, %NULL-terminated array of strings holding the members name. Use g_strfreev() when done.
           
             
           
@@ -2885,11 +2795,9 @@ property contained inside @property_node into @value.
       
-        FIXME
-
-or %NULL if no property was found
+        FIXME
         
-          the #GParamSpec for the property
+          the #GParamSpec for the property or %NULL if no property was found
           
         
         
@@ -2967,14 +2875,14 @@ This function can be used inside a custom implementation
 of the deserialize_property() virtual function in lieu of:
 
 |[
-JsonSerializable *iface;
-gboolean res;
-
-iface = g_type_default_interface_peek (JSON_TYPE_SERIALIZABLE);
-res = iface->deserialize_property (serializable, property_name,
-value,
-pspec,
-property_node);
+  JsonSerializable *iface;
+  gboolean res;
+
+  iface = g_type_default_interface_peek (JSON_TYPE_SERIALIZABLE);
+  res = iface->deserialize_property (serializable, property_name,
+                                     value,
+                                     pspec,
+                                     property_node);
 ]|
         
           %TRUE if the property was successfully deserialized.
@@ -3009,18 +2917,16 @@ This function can be used inside a custom implementation
 of the serialize_property() virtual function in lieu of:
 
 |[
-JsonSerializable *iface;
-JsonNode *node;
+  JsonSerializable *iface;
+  JsonNode *node;
 
-iface = g_type_default_interface_peek (JSON_TYPE_SERIALIZABLE);
-node = iface->serialize_property (serializable, property_name,
-value,
-pspec);
-]|
-
-property
+  iface = g_type_default_interface_peek (JSON_TYPE_SERIALIZABLE);
+  node = iface->serialize_property (serializable, property_name,
+                                    value,
+                                    pspec);
+]|
         
-          a #JsonNode containing the serialized
+          a #JsonNode containing the serialized property
           
         
         
@@ -3071,11 +2977,9 @@ property contained inside @property_node into @value.
       
-        FIXME
-
-or %NULL if no property was found
+        FIXME
         
-          the #GParamSpec for the property
+          the #GParamSpec for the property or %NULL if no property was found
           
         
         
@@ -3102,11 +3006,9 @@ or %NULL if no property was found
       
-        FIXME
-
-of #GParamSpec. Use g_free() to free the array when done.
+        FIXME
         
-          an array
+          an array of #GParamSpec. Use g_free() to free the array when done.
           
             
           
@@ -3230,7 +3132,7 @@ sequence.
       
         
           
-            the #GParamSpec for the property
+            the #GParamSpec for the property or %NULL if no property was found
             
           
           
@@ -3322,11 +3224,9 @@ type @gboxed_type from a #JsonNode of type @node_type
       Checks whether it is possible to serialize a #GBoxed of
 type @gboxed_type into a #JsonNode. The type of the
 #JsonNode is placed inside @node_type if the function
-returns %TRUE and it's undefined otherwise.
-
-and %FALSE otherwise.
+returns %TRUE and it's undefined otherwise.
       
-        %TRUE if the type can be serialized,
+        %TRUE if the type can be serialized, and %FALSE otherwise.
         
       
       
@@ -3346,12 +3246,9 @@ and %FALSE otherwise.
     
-      Deserializes @node into a #GBoxed of @gboxed_type
-
-g_boxed_free() to release the resources allocated by this
-function
+      Deserializes @node into a #GBoxed of @gboxed_type
       
-        the newly allocated #GBoxed. Use
+        the newly allocated #GBoxed. Use g_boxed_free() to release the resources allocated by this function
         
       
       
@@ -3417,11 +3314,9 @@ to a #JsonNode of type @node_type
               c:identifier="json_boxed_serialize"
               version="0.10">
       Serializes @boxed, a pointer to a #GBoxed of type @gboxed_type,
-into a #JsonNode
-
-boxed type, or %NULL if serialization either failed or was not possible
+into a #JsonNode
       
-        a #JsonNode with the serialization of the
+        a #JsonNode with the serialization of the boxed type, or %NULL if serialization either failed or was not possible
         
       
       
@@ -3471,12 +3366,9 @@ Note: the JSON data stream must be an object declaration.
               c:identifier="json_gobject_deserialize"
               version="0.10">
       Creates a new #GObject of type @gtype, and constructs it
-using the members of the passed #JsonObject
-
-instance. Use g_object_unref() to free the resources
-allocated by this function
+using the members of the passed #JsonObject
       
-        The newly created #GObject
+        The newly created #GObject instance. Use g_object_unref() to free the resources allocated by this function
         
       
       
@@ -3525,12 +3417,9 @@ Note: the JSON data stream must be an object declaration.
               version="0.10">
       Creates a #JsonNode representing the passed #GObject
 instance. Each member of the returned JSON object will
-map to a property of the #GObject
-
-of type %JSON_NODE_OBJECT. Use json_node_free() to free
-the resources allocated by this function
+map to a property of the #GObject
       
-        the newly created #JsonNode
+        the newly created #JsonNode of type %JSON_NODE_OBJECT. Use json_node_free() to free the resources allocated by this function
         
       
       
@@ -3581,11 +3470,9 @@ string, %NULL is returned and error is set to %G_IO_ERROR_INVALID_ARGUMENT.
 If a @signature is provided but the JSON structure cannot be mapped to it,
 %NULL is returned and error is set to %G_IO_ERROR_INVALID_DATA.
 If @signature is %NULL, the conversion is done based strictly on the types
-in the JSON nodes.
-
-@signature, or %NULL on error
+in the JSON nodes.
       
-        A newly created #GVariant compliant with
+        A newly created #GVariant compliant with @signature, or %NULL on error
         
       
       
@@ -3606,11 +3493,9 @@ in the JSON nodes.
       Converts a JSON string to a #GVariant value. This method works exactly
 like json_gvariant_deserialize(), but takes a JSON encoded string instead.
 The string is first converted to a #JsonNode using #JsonParser, and then
-json_gvariant_deserialize() is called.
-
-@signature, or %NULL on error
+json_gvariant_deserialize() is called.
       
-        A newly created #GVariant compliant with
+        A newly created #GVariant compliant with @signature, or %NULL on error
         
       
       
@@ -3631,11 +3516,9 @@ json_gvariant_deserialize() is called.
     
-      Converts @variant to a JSON tree.
-
-JSON data structure obtained from @variant
+      Converts @variant to a JSON tree.
       
-        A #JsonNode representing the root of the
+        A #JsonNode representing the root of the JSON data structure obtained from @variant
         
       
       
@@ -3650,11 +3533,9 @@ JSON data structure obtained from @variant
               version="0.14">
       Converts @variant to its JSON encoded string representation. This method
 is actually a helper function. It uses json_gvariant_serialize() to obtain the
-JSON tree, and then #JsonGenerator to stringify it.
-
-@variant
+JSON tree, and then #JsonGenerator to stringify it.
       
-        The JSON encoded string corresponding to
+        The JSON encoded string corresponding to @variant
         
       
       
diff --git a/json-glib/Makefile.am b/json-glib/Makefile.am
index ff9a800..0b84d74 100644
--- a/json-glib/Makefile.am
+++ b/json-glib/Makefile.am
@@ -10,18 +10,17 @@ DIST_SUBDIRS = tests
 
 NULL =
 
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_srcdir) -I$(top_builddir)
 
 AM_CPPFLAGS = \
 	-DPREFIX=\""$(prefix)"\" 	\
 	-DLIBDIR=\""$(libdir)"\" 	\
 	-DJSON_COMPILATION=1		\
-	-DJSON_DISABLE_DEPRECATED	\
 	-DG_LOG_DOMAIN=\"Json\" 	\
 	$(JSON_DEBUG_CFLAGS) 		\
 	$(NULL)
 
-AM_CFLAGS = $(JSON_CFLAGS) $(MAINTAINER_CFLAGS) $(GCOV_CFLAGS)
+AM_CFLAGS = $(JSON_CFLAGS) $(MAINTAINER_CFLAGS) $(JSON_GCOV_CFLAGS)
 
 BUILT_SOURCES =
 
@@ -32,11 +31,11 @@ source_h = \
 	$(top_srcdir)/json-glib/json-builder.h		\
 	$(top_srcdir)/json-glib/json-generator.h 	\
 	$(top_srcdir)/json-glib/json-gobject.h 		\
+	$(top_srcdir)/json-glib/json-gvariant.h		\
 	$(top_srcdir)/json-glib/json-parser.h 		\
 	$(top_srcdir)/json-glib/json-path.h		\
 	$(top_srcdir)/json-glib/json-reader.h		\
 	$(top_srcdir)/json-glib/json-types.h 		\
-	$(top_srcdir)/json-glib/json-gvariant.h		\
 	$(NULL)
 
 source_h_private = \
@@ -53,6 +52,7 @@ source_c = \
 	$(srcdir)/json-gboxed.c		\
 	$(srcdir)/json-generator.c 	\
 	$(srcdir)/json-gobject.c 	\
+	$(srcdir)/json-gvariant.c	\
 	$(srcdir)/json-node.c 		\
 	$(srcdir)/json-object.c 	\
 	$(srcdir)/json-parser.c 	\
@@ -60,7 +60,7 @@ source_c = \
 	$(srcdir)/json-reader.c		\
 	$(srcdir)/json-scanner.c 	\
 	$(srcdir)/json-serializable.c	\
-	$(srcdir)/json-gvariant.c	\
+	$(srcdir)/json-value.c		\
 	$(NULL)
 
 # glib-mkenums rules
@@ -78,7 +78,7 @@ lib_LTLIBRARIES = libjson-glib-1.0.la
 
 libjson_glib_1_0_la_LIBADD = $(JSON_LIBS)
 libjson_glib_1_0_la_SOURCES = $(source_c) $(source_h) $(source_h_private) $(BUILT_SOURCES)
-libjson_glib_1_0_la_LDFLAGS = $(JSON_LT_LDFLAGS) $(GCOV_LDFLAGS) -export-dynamic -export-symbols-regex "^json.*" -rpath $(libdir)
+libjson_glib_1_0_la_LDFLAGS = $(JSON_LT_LDFLAGS) $(JSON_GCOV_LDADD) -export-dynamic -export-symbols-regex "^json.*" -rpath $(libdir)
 
 jsonincludedir = $(includedir)/json-glib-1.0/json-glib
 jsoninclude_DATA = \
@@ -92,6 +92,12 @@ EXTRA_DIST += json-version.h.in json-glib.h json-version.h
 
 TESTS_ENVIRONMENT = srcdir="$(srcdir)" json_all_c_sources="$(source_c)"
 
+if OS_LINUX
+TESTS = abicheck.sh
+endif
+
+EXTRA_DIST += abicheck.sh
+
 # intospection
 -include $(INTROSPECTION_MAKEFILE)
 
@@ -104,7 +110,7 @@ Json_1_0_gir_NAMESPACE = Json
 Json_1_0_gir_VERSION = 1.0
 Json_1_0_gir_LIBS = libjson-glib-1.0.la
 Json_1_0_gir_FILES = $(source_h) $(source_c)
-Json_1_0_gir_CFLAGS = $(INCLUDES) $(AM_CPPFLAGS) $(JSON_CFLAGS) -UJSON_DISABLE_DEPRECATED
+Json_1_0_gir_CFLAGS = $(INCLUDES) $(AM_CPPFLAGS) $(JSON_CFLAGS)
 Json_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
 Json_1_0_gir_SCANNERFLAGS = --warn-all --pkg-export json-glib-1.0 --c-include "json-glib/json-glib.h"
 
@@ -155,6 +161,3 @@ dist-hook: ../build/win32/vs9/json-glib.vcproj ../build/win32/vs10/json-glib.vcx
 DISTCLEANFILES += ../build/win32/vs9/json-glib.vcproj	\
 		  ../build/win32/vs10/json-glib.vcxproj	\
 		  ../build/win32/vs10/json-glib.vcxproj.filters
-
-gcov_sources = $(source_c)
-include $(top_srcdir)/build/autotools/Makefile.am.gcov
diff --git a/json-glib/Makefile.in b/json-glib/Makefile.in
index c93bc88..b8cb7a2 100644
--- a/json-glib/Makefile.in
+++ b/json-glib/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -75,7 +75,6 @@ host_triplet = @host@
 DIST_COMMON = $(am__dist_gir_DATA_DIST) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/json-version.h.in \
 	$(top_srcdir)/build/autotools/Makefile.am.enums \
-	$(top_srcdir)/build/autotools/Makefile.am.gcov \
 	$(top_srcdir)/build/autotools/Makefile.am.gtest \
 	$(top_srcdir)/build/autotools/Makefile.am.marshal \
 	$(top_srcdir)/build/autotools/Makefile.am.silent
@@ -129,6 +128,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" \
 	"$(DESTDIR)$(jsonincludedir)" "$(DESTDIR)$(typelibsdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -136,10 +141,10 @@ am__DEPENDENCIES_1 =
 libjson_glib_1_0_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am__objects_1 =
 am__objects_2 = json-array.lo json-builder.lo json-debug.lo \
-	json-gboxed.lo json-generator.lo json-gobject.lo json-node.lo \
-	json-object.lo json-parser.lo json-path.lo json-reader.lo \
-	json-scanner.lo json-serializable.lo json-gvariant.lo \
-	$(am__objects_1)
+	json-gboxed.lo json-generator.lo json-gobject.lo \
+	json-gvariant.lo json-node.lo json-object.lo json-parser.lo \
+	json-path.lo json-reader.lo json-scanner.lo \
+	json-serializable.lo json-value.lo $(am__objects_1)
 am__objects_3 = $(am__objects_1)
 am__objects_4 = json-enum-types.lo
 am__objects_5 = json-marshal.lo
@@ -149,8 +154,8 @@ am__objects_7 = $(am__objects_1) $(am__objects_4) $(am__objects_3) \
 am_libjson_glib_1_0_la_OBJECTS = $(am__objects_2) $(am__objects_3) \
 	$(am__objects_3) $(am__objects_7)
 libjson_glib_1_0_la_OBJECTS = $(am_libjson_glib_1_0_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 libjson_glib_1_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -166,21 +171,21 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libjson_glib_1_0_la_SOURCES)
 DIST_SOURCES = $(libjson_glib_1_0_la_SOURCES)
@@ -200,6 +205,8 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 	distdir
 ETAGS = etags
 CTAGS = ctags
+am__tty_colors = \
+red=; grn=; lgn=; blu=; std=
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -252,11 +259,10 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-GCOV_CFLAGS = @GCOV_CFLAGS@
-GCOV_LDFLAGS = @GCOV_LDFLAGS@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
@@ -288,6 +294,8 @@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 JSON_CFLAGS = @JSON_CFLAGS@
 JSON_DEBUG_CFLAGS = @JSON_DEBUG_CFLAGS@
+JSON_GCOV_CFLAGS = @JSON_GCOV_CFLAGS@
+JSON_GCOV_LDADD = @JSON_GCOV_LDADD@
 JSON_LIBS = @JSON_LIBS@
 JSON_LT_LDFLAGS = @JSON_LT_LDFLAGS@
 JSON_MAJOR_VERSION = @JSON_MAJOR_VERSION@
@@ -307,6 +315,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+LTP = @LTP@
+LTP_GENHTML = @LTP_GENHTML@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -336,6 +346,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SHTOOL = @SHTOOL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@@ -407,24 +418,23 @@ GTESTER_REPORT = gtester-report
 # initialize variables for unconditional += appending
 EXTRA_DIST = $(srcdir)/$(enum_tmpl_h) $(srcdir)/$(enum_tmpl_c) \
 	$(srcdir)/$(glib_marshal_list) json-version.h.in json-glib.h \
-	json-version.h json-glib.symbols
+	json-version.h abicheck.sh json-glib.symbols
 TEST_PROGS = 
 
 # build this directory *before* the tests/
 @ENABLE_GLIB_TEST_TRUE@SUBDIRS = . tests
 DIST_SUBDIRS = tests
 NULL = 
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_srcdir) -I$(top_builddir)
 AM_CPPFLAGS = \
 	-DPREFIX=\""$(prefix)"\" 	\
 	-DLIBDIR=\""$(libdir)"\" 	\
 	-DJSON_COMPILATION=1		\
-	-DJSON_DISABLE_DEPRECATED	\
 	-DG_LOG_DOMAIN=\"Json\" 	\
 	$(JSON_DEBUG_CFLAGS) 		\
 	$(NULL)
 
-AM_CFLAGS = $(JSON_CFLAGS) $(MAINTAINER_CFLAGS) $(GCOV_CFLAGS)
+AM_CFLAGS = $(JSON_CFLAGS) $(MAINTAINER_CFLAGS) $(JSON_GCOV_CFLAGS)
 BUILT_SOURCES = $(glib_enum_h) $(glib_enum_c) $(marshal_h) \
 	$(marshal_c)
 CLEANFILES = stamp-enum-types stamp-marshal $(am__append_1)
@@ -438,11 +448,11 @@ source_h = \
 	$(top_srcdir)/json-glib/json-builder.h		\
 	$(top_srcdir)/json-glib/json-generator.h 	\
 	$(top_srcdir)/json-glib/json-gobject.h 		\
+	$(top_srcdir)/json-glib/json-gvariant.h		\
 	$(top_srcdir)/json-glib/json-parser.h 		\
 	$(top_srcdir)/json-glib/json-path.h		\
 	$(top_srcdir)/json-glib/json-reader.h		\
 	$(top_srcdir)/json-glib/json-types.h 		\
-	$(top_srcdir)/json-glib/json-gvariant.h		\
 	$(NULL)
 
 source_h_private = \
@@ -459,6 +469,7 @@ source_c = \
 	$(srcdir)/json-gboxed.c		\
 	$(srcdir)/json-generator.c 	\
 	$(srcdir)/json-gobject.c 	\
+	$(srcdir)/json-gvariant.c	\
 	$(srcdir)/json-node.c 		\
 	$(srcdir)/json-object.c 	\
 	$(srcdir)/json-parser.c 	\
@@ -466,7 +477,7 @@ source_c = \
 	$(srcdir)/json-reader.c		\
 	$(srcdir)/json-scanner.c 	\
 	$(srcdir)/json-serializable.c	\
-	$(srcdir)/json-gvariant.c	\
+	$(srcdir)/json-value.c		\
 	$(NULL)
 
 
@@ -485,7 +496,7 @@ marshal_c = $(glib_marshal_list:.list=.c)
 lib_LTLIBRARIES = libjson-glib-1.0.la
 libjson_glib_1_0_la_LIBADD = $(JSON_LIBS)
 libjson_glib_1_0_la_SOURCES = $(source_c) $(source_h) $(source_h_private) $(BUILT_SOURCES)
-libjson_glib_1_0_la_LDFLAGS = $(JSON_LT_LDFLAGS) $(GCOV_LDFLAGS) -export-dynamic -export-symbols-regex "^json.*" -rpath $(libdir)
+libjson_glib_1_0_la_LDFLAGS = $(JSON_LT_LDFLAGS) $(JSON_GCOV_LDADD) -export-dynamic -export-symbols-regex "^json.*" -rpath $(libdir)
 jsonincludedir = $(includedir)/json-glib-1.0/json-glib
 jsoninclude_DATA = \
 	$(source_h) 					\
@@ -495,25 +506,25 @@ jsoninclude_DATA = \
 	$(NULL)
 
 TESTS_ENVIRONMENT = srcdir="$(srcdir)" json_all_c_sources="$(source_c)"
+@OS_LINUX_TRUE@TESTS = abicheck.sh
 @HAVE_INTROSPECTION_TRUE@INTROSPECTION_GIRS = Json-1.0.gir
 @HAVE_INTROSPECTION_TRUE@Json_1_0_gir_NAMESPACE = Json
 @HAVE_INTROSPECTION_TRUE@Json_1_0_gir_VERSION = 1.0
 @HAVE_INTROSPECTION_TRUE@Json_1_0_gir_LIBS = libjson-glib-1.0.la
 @HAVE_INTROSPECTION_TRUE@Json_1_0_gir_FILES = $(source_h) $(source_c)
-@HAVE_INTROSPECTION_TRUE@Json_1_0_gir_CFLAGS = $(INCLUDES) $(AM_CPPFLAGS) $(JSON_CFLAGS) -UJSON_DISABLE_DEPRECATED
+@HAVE_INTROSPECTION_TRUE@Json_1_0_gir_CFLAGS = $(INCLUDES) $(AM_CPPFLAGS) $(JSON_CFLAGS)
 @HAVE_INTROSPECTION_TRUE@Json_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
 @HAVE_INTROSPECTION_TRUE@Json_1_0_gir_SCANNERFLAGS = --warn-all --pkg-export json-glib-1.0 --c-include "json-glib/json-glib.h"
 @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
 @HAVE_INTROSPECTION_TRUE@dist_gir_DATA = Json-1.0.gir
 @HAVE_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0/
 @HAVE_INTROSPECTION_TRUE@typelibs_DATA = Json-1.0.typelib
-gcov_sources = $(source_c)
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/build/autotools/Makefile.am.silent $(top_srcdir)/build/autotools/Makefile.am.gtest $(top_srcdir)/build/autotools/Makefile.am.enums $(top_srcdir)/build/autotools/Makefile.am.marshal $(top_srcdir)/build/autotools/Makefile.am.gcov $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/build/autotools/Makefile.am.silent $(top_srcdir)/build/autotools/Makefile.am.gtest $(top_srcdir)/build/autotools/Makefile.am.enums $(top_srcdir)/build/autotools/Makefile.am.marshal $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -534,6 +545,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/build/autotools/Makefile.am.silent $(top_srcdir)/build/autotools/Makefile.am.gtest $(top_srcdir)/build/autotools/Makefile.am.enums $(top_srcdir)/build/autotools/Makefile.am.marshal:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -576,7 +588,7 @@ clean-libLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libjson-glib-1.0.la: $(libjson_glib_1_0_la_OBJECTS) $(libjson_glib_1_0_la_DEPENDENCIES) 
+libjson-glib-1.0.la: $(libjson_glib_1_0_la_OBJECTS) $(libjson_glib_1_0_la_DEPENDENCIES) $(EXTRA_libjson_glib_1_0_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libjson_glib_1_0_la_LINK) -rpath $(libdir) $(libjson_glib_1_0_la_OBJECTS) $(libjson_glib_1_0_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -601,142 +613,133 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json-reader.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json-scanner.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json-serializable.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json-value.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 json-array.lo: $(srcdir)/json-array.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-array.lo -MD -MP -MF $(DEPDIR)/json-array.Tpo -c -o json-array.lo `test -f '$(srcdir)/json-array.c' || echo '$(srcdir)/'`$(srcdir)/json-array.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-array.Tpo $(DEPDIR)/json-array.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/json-array.c' object='json-array.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(srcdir)/json-array.c' object='json-array.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-array.lo `test -f '$(srcdir)/json-array.c' || echo '$(srcdir)/'`$(srcdir)/json-array.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-array.lo `test -f '$(srcdir)/json-array.c' || echo '$(srcdir)/'`$(srcdir)/json-array.c
 
 json-builder.lo: $(srcdir)/json-builder.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-builder.lo -MD -MP -MF $(DEPDIR)/json-builder.Tpo -c -o json-builder.lo `test -f '$(srcdir)/json-builder.c' || echo '$(srcdir)/'`$(srcdir)/json-builder.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-builder.Tpo $(DEPDIR)/json-builder.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/json-builder.c' object='json-builder.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(srcdir)/json-builder.c' object='json-builder.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-builder.lo `test -f '$(srcdir)/json-builder.c' || echo '$(srcdir)/'`$(srcdir)/json-builder.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-builder.lo `test -f '$(srcdir)/json-builder.c' || echo '$(srcdir)/'`$(srcdir)/json-builder.c
 
 json-debug.lo: $(srcdir)/json-debug.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-debug.lo -MD -MP -MF $(DEPDIR)/json-debug.Tpo -c -o json-debug.lo `test -f '$(srcdir)/json-debug.c' || echo '$(srcdir)/'`$(srcdir)/json-debug.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-debug.Tpo $(DEPDIR)/json-debug.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/json-debug.c' object='json-debug.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(srcdir)/json-debug.c' object='json-debug.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-debug.lo `test -f '$(srcdir)/json-debug.c' || echo '$(srcdir)/'`$(srcdir)/json-debug.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-debug.lo `test -f '$(srcdir)/json-debug.c' || echo '$(srcdir)/'`$(srcdir)/json-debug.c
 
 json-gboxed.lo: $(srcdir)/json-gboxed.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-gboxed.lo -MD -MP -MF $(DEPDIR)/json-gboxed.Tpo -c -o json-gboxed.lo `test -f '$(srcdir)/json-gboxed.c' || echo '$(srcdir)/'`$(srcdir)/json-gboxed.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-gboxed.Tpo $(DEPDIR)/json-gboxed.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/json-gboxed.c' object='json-gboxed.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(srcdir)/json-gboxed.c' object='json-gboxed.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-gboxed.lo `test -f '$(srcdir)/json-gboxed.c' || echo '$(srcdir)/'`$(srcdir)/json-gboxed.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-gboxed.lo `test -f '$(srcdir)/json-gboxed.c' || echo '$(srcdir)/'`$(srcdir)/json-gboxed.c
 
 json-generator.lo: $(srcdir)/json-generator.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-generator.lo -MD -MP -MF $(DEPDIR)/json-generator.Tpo -c -o json-generator.lo `test -f '$(srcdir)/json-generator.c' || echo '$(srcdir)/'`$(srcdir)/json-generator.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-generator.Tpo $(DEPDIR)/json-generator.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/json-generator.c' object='json-generator.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(srcdir)/json-generator.c' object='json-generator.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-generator.lo `test -f '$(srcdir)/json-generator.c' || echo '$(srcdir)/'`$(srcdir)/json-generator.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-generator.lo `test -f '$(srcdir)/json-generator.c' || echo '$(srcdir)/'`$(srcdir)/json-generator.c
 
 json-gobject.lo: $(srcdir)/json-gobject.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-gobject.lo -MD -MP -MF $(DEPDIR)/json-gobject.Tpo -c -o json-gobject.lo `test -f '$(srcdir)/json-gobject.c' || echo '$(srcdir)/'`$(srcdir)/json-gobject.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-gobject.Tpo $(DEPDIR)/json-gobject.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/json-gobject.c' object='json-gobject.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(srcdir)/json-gobject.c' object='json-gobject.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-gobject.lo `test -f '$(srcdir)/json-gobject.c' || echo '$(srcdir)/'`$(srcdir)/json-gobject.c
+
+json-gvariant.lo: $(srcdir)/json-gvariant.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-gvariant.lo -MD -MP -MF $(DEPDIR)/json-gvariant.Tpo -c -o json-gvariant.lo `test -f '$(srcdir)/json-gvariant.c' || echo '$(srcdir)/'`$(srcdir)/json-gvariant.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-gvariant.Tpo $(DEPDIR)/json-gvariant.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(srcdir)/json-gvariant.c' object='json-gvariant.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-gobject.lo `test -f '$(srcdir)/json-gobject.c' || echo '$(srcdir)/'`$(srcdir)/json-gobject.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-gvariant.lo `test -f '$(srcdir)/json-gvariant.c' || echo '$(srcdir)/'`$(srcdir)/json-gvariant.c
 
 json-node.lo: $(srcdir)/json-node.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-node.lo -MD -MP -MF $(DEPDIR)/json-node.Tpo -c -o json-node.lo `test -f '$(srcdir)/json-node.c' || echo '$(srcdir)/'`$(srcdir)/json-node.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-node.Tpo $(DEPDIR)/json-node.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/json-node.c' object='json-node.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(srcdir)/json-node.c' object='json-node.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-node.lo `test -f '$(srcdir)/json-node.c' || echo '$(srcdir)/'`$(srcdir)/json-node.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-node.lo `test -f '$(srcdir)/json-node.c' || echo '$(srcdir)/'`$(srcdir)/json-node.c
 
 json-object.lo: $(srcdir)/json-object.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-object.lo -MD -MP -MF $(DEPDIR)/json-object.Tpo -c -o json-object.lo `test -f '$(srcdir)/json-object.c' || echo '$(srcdir)/'`$(srcdir)/json-object.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-object.Tpo $(DEPDIR)/json-object.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/json-object.c' object='json-object.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(srcdir)/json-object.c' object='json-object.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-object.lo `test -f '$(srcdir)/json-object.c' || echo '$(srcdir)/'`$(srcdir)/json-object.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-object.lo `test -f '$(srcdir)/json-object.c' || echo '$(srcdir)/'`$(srcdir)/json-object.c
 
 json-parser.lo: $(srcdir)/json-parser.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-parser.lo -MD -MP -MF $(DEPDIR)/json-parser.Tpo -c -o json-parser.lo `test -f '$(srcdir)/json-parser.c' || echo '$(srcdir)/'`$(srcdir)/json-parser.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-parser.Tpo $(DEPDIR)/json-parser.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/json-parser.c' object='json-parser.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(srcdir)/json-parser.c' object='json-parser.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-parser.lo `test -f '$(srcdir)/json-parser.c' || echo '$(srcdir)/'`$(srcdir)/json-parser.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-parser.lo `test -f '$(srcdir)/json-parser.c' || echo '$(srcdir)/'`$(srcdir)/json-parser.c
 
 json-path.lo: $(srcdir)/json-path.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-path.lo -MD -MP -MF $(DEPDIR)/json-path.Tpo -c -o json-path.lo `test -f '$(srcdir)/json-path.c' || echo '$(srcdir)/'`$(srcdir)/json-path.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-path.Tpo $(DEPDIR)/json-path.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/json-path.c' object='json-path.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(srcdir)/json-path.c' object='json-path.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-path.lo `test -f '$(srcdir)/json-path.c' || echo '$(srcdir)/'`$(srcdir)/json-path.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-path.lo `test -f '$(srcdir)/json-path.c' || echo '$(srcdir)/'`$(srcdir)/json-path.c
 
 json-reader.lo: $(srcdir)/json-reader.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-reader.lo -MD -MP -MF $(DEPDIR)/json-reader.Tpo -c -o json-reader.lo `test -f '$(srcdir)/json-reader.c' || echo '$(srcdir)/'`$(srcdir)/json-reader.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-reader.Tpo $(DEPDIR)/json-reader.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/json-reader.c' object='json-reader.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(srcdir)/json-reader.c' object='json-reader.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-reader.lo `test -f '$(srcdir)/json-reader.c' || echo '$(srcdir)/'`$(srcdir)/json-reader.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-reader.lo `test -f '$(srcdir)/json-reader.c' || echo '$(srcdir)/'`$(srcdir)/json-reader.c
 
 json-scanner.lo: $(srcdir)/json-scanner.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-scanner.lo -MD -MP -MF $(DEPDIR)/json-scanner.Tpo -c -o json-scanner.lo `test -f '$(srcdir)/json-scanner.c' || echo '$(srcdir)/'`$(srcdir)/json-scanner.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-scanner.Tpo $(DEPDIR)/json-scanner.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/json-scanner.c' object='json-scanner.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(srcdir)/json-scanner.c' object='json-scanner.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-scanner.lo `test -f '$(srcdir)/json-scanner.c' || echo '$(srcdir)/'`$(srcdir)/json-scanner.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-scanner.lo `test -f '$(srcdir)/json-scanner.c' || echo '$(srcdir)/'`$(srcdir)/json-scanner.c
 
 json-serializable.lo: $(srcdir)/json-serializable.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-serializable.lo -MD -MP -MF $(DEPDIR)/json-serializable.Tpo -c -o json-serializable.lo `test -f '$(srcdir)/json-serializable.c' || echo '$(srcdir)/'`$(srcdir)/json-serializable.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-serializable.Tpo $(DEPDIR)/json-serializable.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/json-serializable.c' object='json-serializable.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(srcdir)/json-serializable.c' object='json-serializable.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-serializable.lo `test -f '$(srcdir)/json-serializable.c' || echo '$(srcdir)/'`$(srcdir)/json-serializable.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-serializable.lo `test -f '$(srcdir)/json-serializable.c' || echo '$(srcdir)/'`$(srcdir)/json-serializable.c
 
-json-gvariant.lo: $(srcdir)/json-gvariant.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-gvariant.lo -MD -MP -MF $(DEPDIR)/json-gvariant.Tpo -c -o json-gvariant.lo `test -f '$(srcdir)/json-gvariant.c' || echo '$(srcdir)/'`$(srcdir)/json-gvariant.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-gvariant.Tpo $(DEPDIR)/json-gvariant.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/json-gvariant.c' object='json-gvariant.lo' libtool=yes @AMDEPBACKSLASH@
+json-value.lo: $(srcdir)/json-value.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-value.lo -MD -MP -MF $(DEPDIR)/json-value.Tpo -c -o json-value.lo `test -f '$(srcdir)/json-value.c' || echo '$(srcdir)/'`$(srcdir)/json-value.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-value.Tpo $(DEPDIR)/json-value.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(srcdir)/json-value.c' object='json-value.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-gvariant.lo `test -f '$(srcdir)/json-gvariant.c' || echo '$(srcdir)/'`$(srcdir)/json-gvariant.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-value.lo `test -f '$(srcdir)/json-value.c' || echo '$(srcdir)/'`$(srcdir)/json-value.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -760,9 +763,7 @@ uninstall-dist_girDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_gir_DATA)'; test -n "$(girdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(girdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(girdir)" && rm -f $$files
+	dir='$(DESTDIR)$(girdir)'; $(am__uninstall_files_from_dir)
 install-jsonincludeDATA: $(jsoninclude_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(jsonincludedir)" || $(MKDIR_P) "$(DESTDIR)$(jsonincludedir)"
@@ -780,9 +781,7 @@ uninstall-jsonincludeDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(jsoninclude_DATA)'; test -n "$(jsonincludedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(jsonincludedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(jsonincludedir)" && rm -f $$files
+	dir='$(DESTDIR)$(jsonincludedir)'; $(am__uninstall_files_from_dir)
 install-typelibsDATA: $(typelibs_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(typelibsdir)" || $(MKDIR_P) "$(DESTDIR)$(typelibsdir)"
@@ -800,9 +799,7 @@ uninstall-typelibsDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(typelibs_DATA)'; test -n "$(typelibsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(typelibsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(typelibsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(typelibsdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -939,6 +936,99 @@ GTAGS:
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
+check-TESTS: $(TESTS)
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+	srcdir=$(srcdir); export srcdir; \
+	list=' $(TESTS) '; \
+	$(am__tty_colors); \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *[\ \	]$$tst[\ \	]*) \
+		xpass=`expr $$xpass + 1`; \
+		failed=`expr $$failed + 1`; \
+		col=$$red; res=XPASS; \
+	      ;; \
+	      *) \
+		col=$$grn; res=PASS; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *[\ \	]$$tst[\ \	]*) \
+		xfail=`expr $$xfail + 1`; \
+		col=$$lgn; res=XFAIL; \
+	      ;; \
+	      *) \
+		failed=`expr $$failed + 1`; \
+		col=$$red; res=FAIL; \
+	      ;; \
+	      esac; \
+	    else \
+	      skip=`expr $$skip + 1`; \
+	      col=$$blu; res=SKIP; \
+	    fi; \
+	    echo "$${col}$$res$${std}: $$tst"; \
+	  done; \
+	  if test "$$all" -eq 1; then \
+	    tests="test"; \
+	    All=""; \
+	  else \
+	    tests="tests"; \
+	    All="All "; \
+	  fi; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="$$All$$all $$tests passed"; \
+	    else \
+	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+	    fi; \
+	  else \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all $$tests failed"; \
+	    else \
+	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+	    fi; \
+	  fi; \
+	  dashes="$$banner"; \
+	  skipped=""; \
+	  if test "$$skip" -ne 0; then \
+	    if test "$$skip" -eq 1; then \
+	      skipped="($$skip test was not run)"; \
+	    else \
+	      skipped="($$skip tests were not run)"; \
+	    fi; \
+	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$skipped"; \
+	  fi; \
+	  report=""; \
+	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+	    report="Please report to $(PACKAGE_BUGREPORT)"; \
+	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$report"; \
+	  fi; \
+	  dashes=`echo "$$dashes" | sed s/./=/g`; \
+	  if test "$$failed" -eq 0; then \
+	    col="$$grn"; \
+	  else \
+	    col="$$red"; \
+	  fi; \
+	  echo "$${col}$$dashes$${std}"; \
+	  echo "$${col}$$banner$${std}"; \
+	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+	  test -z "$$report" || echo "$${col}$$report$${std}"; \
+	  echo "$${col}$$dashes$${std}"; \
+	  test "$$failed" -eq 0; \
+	else :; fi
+
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -1001,7 +1091,7 @@ distdir: $(DISTFILES)
 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
 	  dist-hook
 check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-local
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-recursive
 all-am: Makefile $(LTLIBRARIES) $(DATA)
@@ -1021,10 +1111,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -1117,12 +1212,12 @@ uninstall-am: uninstall-dist_girDATA uninstall-jsonincludeDATA \
 	tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am check-local clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
-	dist-hook distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dist_girDATA install-dvi \
+	all all-am check check-TESTS check-am check-local clean \
+	clean-generic clean-libLTLIBRARIES clean-libtool ctags \
+	ctags-recursive dist-hook distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dist_girDATA install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am \
 	install-jsonincludeDATA install-libLTLIBRARIES install-man \
@@ -1269,38 +1364,6 @@ dist-hook: ../build/win32/vs9/json-glib.vcproj ../build/win32/vs10/json-glib.vcx
 	done >jsonglib.vs10.sourcefiles.filters
 	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/json-glib.vcxproj.filtersin >$@
 	rm jsonglib.vs10.sourcefiles.filters
-@GCOV_ENABLED_TRUE@gcov-report.txt: gcov-clean
-@GCOV_ENABLED_TRUE@	$(QUIET_GEN)(rm -f $@; \
-@GCOV_ENABLED_TRUE@	echo -e "Test coverage for json-glib:\n" >> $@; \
-@GCOV_ENABLED_TRUE@	total_covered=0; total_actual=0; \
-@GCOV_ENABLED_TRUE@	for file in $(filter %.c,$(gcov_sources)); do \
-@GCOV_ENABLED_TRUE@		gcov -o .libs/$${file/.c/.gcda} $$file > /dev/null; \
-@GCOV_ENABLED_TRUE@		if test -f $$file.gcov; then \
-@GCOV_ENABLED_TRUE@			actual=`grep -v ' -:' $$file.gcov | wc -l`; \
-@GCOV_ENABLED_TRUE@			uncovered=`grep '#####:' $$file.gcov | wc -l`; \
-@GCOV_ENABLED_TRUE@			covered=$$((actual - uncovered)); \
-@GCOV_ENABLED_TRUE@			total_covered=$$((total_covered + covered)); \
-@GCOV_ENABLED_TRUE@			total_actual=$$((total_actual + actual)); \
-@GCOV_ENABLED_TRUE@			echo -e "$$file:    \t$$covered / $$actual\t($$((($$covered * 100) / $$actual))%)"; \
-@GCOV_ENABLED_TRUE@		fi \
-@GCOV_ENABLED_TRUE@	done >> $@; \
-@GCOV_ENABLED_TRUE@	cd $(abs_srcdir); \
-@GCOV_ENABLED_TRUE@	echo -e "\nSource lines: $$total_actual\nCovered statements: $$total_covered\nTotal coverage: $$((($$total_covered * 100) / $$total_actual))%" >> $@)
-
-@GCOV_ENABLED_TRUE@gcov: gcov-report.txt
-@GCOV_ENABLED_TRUE@	@cat gcov-report.txt
-@GCOV_ENABLED_TRUE@gcov-clean:
-@GCOV_ENABLED_TRUE@	@find . -name "*.gcda" -o -name "*.gcov" -delete
-@GCOV_ENABLED_FALSE@gcov-report.txt:
-@GCOV_ENABLED_FALSE@	@true
-@GCOV_ENABLED_FALSE@gcov-clean:
-@GCOV_ENABLED_FALSE@	@true
-@GCOV_ENABLED_FALSE@gcov:
-@GCOV_ENABLED_FALSE@	@echo "Need to reconfigure with --enable-gcov"
-
-.PHONY: gcov gcov-clean gcov-report.txt
-
-check-local: gcov
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/json-glib/abicheck.sh b/json-glib/abicheck.sh
new file mode 100755
index 0000000..0cba7f9
--- /dev/null
+++ b/json-glib/abicheck.sh
@@ -0,0 +1,6 @@
+#! /bin/sh
+
+cpp -P ${cppargs} ${srcdir:-.}/json-glib.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' -e 's/ DATA//' | sort > expected-abi
+
+nm -D -g --defined-only .libs/libjson-glib-1.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi
+diff -u expected-abi actual-abi && rm -f expected-abi actual-abi
diff --git a/json-glib/json-glib.symbols b/json-glib/json-glib.symbols
index 8727fa5..93f3827 100644
--- a/json-glib/json-glib.symbols
+++ b/json-glib/json-glib.symbols
@@ -1,4 +1,3 @@
-
 json_array_add_array_element
 json_array_add_boolean_element
 json_array_add_double_element
@@ -46,11 +45,17 @@ json_builder_get_type
 json_builder_new
 json_builder_reset
 json_builder_set_member_name
-#ifndef JSON_DISABLE_DEPRECATED
 json_construct_gobject
-#endif
+json_deserialize_pspec
+json_generator_get_indent
+json_generator_get_indent_char
+json_generator_get_pretty
+json_generator_get_root
 json_generator_get_type
 json_generator_new
+json_generator_set_indent
+json_generator_set_indent_char
+json_generator_set_pretty
 json_generator_set_root
 json_generator_to_data
 json_generator_to_file
@@ -93,9 +98,7 @@ json_node_take_array
 json_node_take_object
 json_node_type_get_type
 json_node_type_name
-#ifndef JSON_DISABLE_DEPRECATED
 json_object_add_member
-#endif
 json_object_dup_member
 json_object_foreach_member
 json_object_get_array_member
@@ -137,6 +140,7 @@ json_parser_load_from_stream_async
 json_parser_load_from_stream_finish
 json_parser_new
 json_path_compile
+json_path_error_get_type
 json_path_error_quark
 json_path_get_type
 json_path_match
@@ -165,11 +169,14 @@ json_reader_new
 json_reader_read_element
 json_reader_read_member
 json_reader_set_root
+json_serializable_find_property
+json_serializable_get_property
 json_serializable_default_deserialize_property
 json_serializable_default_serialize_property
 json_serializable_deserialize_property
+json_serializable_list_properties
 json_serializable_get_type
-#ifndef JSON_DISABLE_DEPRECATED
+json_serializable_set_property
 json_serialize_gobject
-#endif
 json_serializable_serialize_property
+json_serialize_pspec
diff --git a/json-glib/json-gobject.h b/json-glib/json-gobject.h
index 2e06d88..c19c457 100644
--- a/json-glib/json-gobject.h
+++ b/json-glib/json-gobject.h
@@ -167,15 +167,14 @@ GObject * json_gobject_from_data               (GType                    gtype,
 gchar *   json_gobject_to_data                 (GObject                 *gobject,
                                                 gsize                   *length);
 
-#ifndef JSON_DISABLE_DEPRECATED
+JSON_DEPRECATED_FOR(json_gobject_from_data)
 GObject * json_construct_gobject               (GType                    gtype,
                                                 const gchar             *data,
                                                 gsize                    length,
-                                                GError                 **error) G_GNUC_DEPRECATED;
+                                                GError                 **error);
+JSON_DEPRECATED_FOR(json_gobject_to_data)
 gchar *   json_serialize_gobject               (GObject                 *gobject,
-                                                gsize                   *length) G_GNUC_MALLOC G_GNUC_DEPRECATED;
-#endif /* JSON_DISABLE_DEPRECATED */
-
+                                                gsize                   *length) G_GNUC_MALLOC;
 
 G_END_DECLS
 
diff --git a/json-glib/json-node.c b/json-glib/json-node.c
index 67cdc95..3d434f3 100644
--- a/json-glib/json-node.c
+++ b/json-glib/json-node.c
@@ -77,7 +77,10 @@ json_node_get_value_type (JsonNode *node)
       return G_TYPE_INVALID;
 
     case JSON_NODE_VALUE:
-      return G_VALUE_TYPE (&(node->data.value));
+      if (node->data.value)
+        return JSON_VALUE_TYPE (node->data.value);
+      else
+        return G_TYPE_INVALID;
 
     default:
       g_assert_not_reached ();
@@ -129,21 +132,16 @@ json_node_copy (JsonNode *node)
   switch (copy->type)
     {
     case JSON_NODE_OBJECT:
-      if (node->data.object)
-        copy->data.object = json_object_ref (node->data.object);
+      copy->data.object = json_node_dup_object (node);
       break;
 
     case JSON_NODE_ARRAY:
-      if (node->data.array)
-        copy->data.array = json_array_ref (node->data.array);
+      copy->data.array = json_node_dup_array (node);
       break;
 
     case JSON_NODE_VALUE:
-      if (G_VALUE_TYPE (&(node->data.value)) != G_TYPE_INVALID)
-        {
-          g_value_init (&(copy->data.value), G_VALUE_TYPE (&(node->data.value)));
-          g_value_copy (&(node->data.value), &(copy->data.value));
-        }
+      if (node->data.value)
+        copy->data.value = json_value_ref (node->data.value);
       break;
 
     case JSON_NODE_NULL:
@@ -306,7 +304,7 @@ json_node_get_array (JsonNode *node)
 }
 
 /**
- * json_node_dup_array
+ * json_node_dup_array:
  * @node: a #JsonNode
  *
  * Retrieves the #JsonArray stored inside a #JsonNode and returns it
@@ -342,18 +340,31 @@ json_node_get_value (JsonNode *node,
   g_return_if_fail (node != NULL);
   g_return_if_fail (JSON_NODE_TYPE (node) == JSON_NODE_VALUE);
 
-  if (G_VALUE_TYPE (&(node->data.value)) != G_TYPE_INVALID)
+  if (node->data.value)
     {
-      g_value_init (value, G_VALUE_TYPE (&(node->data.value)));
-      g_value_copy (&(node->data.value), value);
-    }
-}
+      g_value_init (value, JSON_VALUE_TYPE (node->data.value));
+      switch (JSON_VALUE_TYPE (node->data.value))
+        {
+        case G_TYPE_INT64:
+          g_value_set_int64 (value, json_value_get_int (node->data.value));
+          break;
 
-static void inline
-node_value_unset (JsonNode *node)
-{
-  if (G_VALUE_TYPE (&(node->data.value)) != G_TYPE_INVALID)
-    g_value_unset (&(node->data.value));
+        case G_TYPE_DOUBLE:
+          g_value_set_double (value, json_value_get_double (node->data.value));
+          break;
+
+        case G_TYPE_BOOLEAN:
+          g_value_set_boolean (value, json_value_get_boolean (node->data.value));
+          break;
+
+        case G_TYPE_STRING:
+          g_value_set_string (value, json_value_get_string (node->data.value));
+          break;
+
+        default:
+          break;
+        }
+    }
 }
 
 /**
@@ -371,32 +382,39 @@ json_node_set_value (JsonNode     *node,
   g_return_if_fail (JSON_NODE_TYPE (node) == JSON_NODE_VALUE);
   g_return_if_fail (G_VALUE_TYPE (value) != G_TYPE_INVALID);
 
+  if (node->data.value == NULL)
+    node->data.value = json_value_alloc ();
+
   switch (G_VALUE_TYPE (value))
     {
-    /* direct copy for the types we use */
+    /* auto-promote machine integers to 64 bit integers */
     case G_TYPE_INT64:
-    case G_TYPE_BOOLEAN:
-    case G_TYPE_DOUBLE:
-    case G_TYPE_STRING:
-      node_value_unset (node);
-      g_value_init (&(node->data.value), G_VALUE_TYPE (value));
-      g_value_copy (value, &(node->data.value));
+    case G_TYPE_INT:
+      json_value_init (node->data.value, JSON_VALUE_INT);
+      if (G_VALUE_TYPE (value) == G_TYPE_INT64)
+        json_value_set_int (node->data.value, g_value_get_int64 (value));
+      else
+        json_value_set_int (node->data.value, g_value_get_int (value));
       break;
 
-    /* auto-promote ints to long longs */
-    case G_TYPE_INT:
-      node_value_unset (node);
-      g_value_init (&(node->data.value), G_TYPE_INT64);
-      g_value_set_int64 (&(node->data.value),
-                         g_value_get_int (value));
+    case G_TYPE_BOOLEAN:
+      json_value_init (node->data.value, JSON_VALUE_BOOLEAN);
+      json_value_set_boolean (node->data.value, g_value_get_boolean (value));
       break;
 
-    /* auto-promote single precision to double precision */
+    /* auto-promote single-precision floats to double precision floats */
+    case G_TYPE_DOUBLE:
     case G_TYPE_FLOAT:
-      node_value_unset (node);
-      g_value_init (&(node->data.value), G_TYPE_DOUBLE);
-      g_value_set_double (&(node->data.value),
-                          g_value_get_float (value));
+      json_value_init (node->data.value, JSON_VALUE_DOUBLE);
+      if (G_VALUE_TYPE (value) == G_TYPE_DOUBLE)
+        json_value_set_double (node->data.value, g_value_get_double (value));
+      else
+        json_value_set_double (node->data.value, g_value_get_float (value));
+      break;
+
+    case G_TYPE_STRING:
+      json_value_init (node->data.value, JSON_VALUE_STRING);
+      json_value_set_string (node->data.value, g_value_get_string (value));
       break;
 
     default:
@@ -431,7 +449,8 @@ json_node_free (JsonNode *node)
           break;
 
         case JSON_NODE_VALUE:
-          g_value_unset (&(node->data.value));
+          if (node->data.value)
+            json_value_unref (node->data.value);
           break;
 
         case JSON_NODE_NULL:
@@ -464,7 +483,8 @@ json_node_type_name (JsonNode *node)
       return json_node_type_get_name (node->type);
 
     case JSON_NODE_VALUE:
-      return g_type_name (G_VALUE_TYPE (&(node->data.value)));
+      if (node->data.value)
+        return json_value_type_get_name (node->data.value->type);
     }
 
   return "unknown";
@@ -545,19 +565,12 @@ json_node_set_string (JsonNode    *node,
   g_return_if_fail (node != NULL);
   g_return_if_fail (JSON_NODE_TYPE (node) == JSON_NODE_VALUE);
 
-  if (G_VALUE_TYPE (&(node->data.value)) == G_TYPE_STRING)
-    g_value_set_string (&(node->data.value), value);
+  if (node->data.value == NULL)
+    node->data.value = json_value_init (json_value_alloc (), JSON_VALUE_STRING);
   else
-    {
-      GValue copy = { 0, };
-
-      g_value_init (©, G_TYPE_STRING);
-      g_value_set_string (©, value);
-
-      json_node_set_value (node, ©);
+    json_value_init (node->data.value, JSON_VALUE_STRING);
 
-      g_value_unset (©);
-    }
+  json_value_set_string (node->data.value, value);
 }
 
 /**
@@ -576,8 +589,8 @@ json_node_get_string (JsonNode *node)
   if (JSON_NODE_TYPE (node) == JSON_NODE_NULL)
     return NULL;
 
-  if (G_VALUE_TYPE (&(node->data.value)) == G_TYPE_STRING)
-    return g_value_get_string (&(node->data.value));
+  if (JSON_VALUE_HOLDS_STRING (node->data.value))
+    return json_value_get_string (node->data.value);
 
   return NULL;
 }
@@ -596,13 +609,7 @@ json_node_dup_string (JsonNode *node)
 {
   g_return_val_if_fail (node != NULL, NULL);
 
-  if (JSON_NODE_TYPE (node) == JSON_NODE_NULL)
-    return NULL;
-
-  if (G_VALUE_TYPE (&(node->data.value)) == G_TYPE_STRING)
-    return g_value_dup_string (&(node->data.value));
-
-  return NULL;
+  return g_strdup (json_node_get_string (node));
 }
 
 /**
@@ -620,19 +627,12 @@ json_node_set_int (JsonNode *node,
   g_return_if_fail (node != NULL);
   g_return_if_fail (JSON_NODE_TYPE (node) == JSON_NODE_VALUE);
 
-  if (G_VALUE_TYPE (&(node->data.value)) == G_TYPE_INT64)
-    g_value_set_int64 (&(node->data.value), value);
+  if (node->data.value == NULL)
+    node->data.value = json_value_init (json_value_alloc (), JSON_VALUE_INT);
   else
-    {
-      GValue copy = { 0, };
-
-      g_value_init (©, G_TYPE_INT64);
-      g_value_set_int64 (©, value);
-
-      json_node_set_value (node, ©);
+    json_value_init (node->data.value, JSON_VALUE_INT);
 
-      g_value_unset (©);
-    }
+  json_value_set_int (node->data.value, value);
 }
 
 /**
@@ -651,8 +651,8 @@ json_node_get_int (JsonNode *node)
   if (JSON_NODE_TYPE (node) == JSON_NODE_NULL)
     return 0;
 
-  if (G_VALUE_TYPE (&(node->data.value)) == G_TYPE_INT64)
-    return g_value_get_int64 (&(node->data.value));
+  if (JSON_VALUE_HOLDS_INT (node->data.value))
+    return json_value_get_int (node->data.value);
 
   return 0;
 }
@@ -672,19 +672,12 @@ json_node_set_double (JsonNode *node,
   g_return_if_fail (node != NULL);
   g_return_if_fail (JSON_NODE_TYPE (node) == JSON_NODE_VALUE);
 
-  if (G_VALUE_TYPE (&(node->data.value)) == G_TYPE_DOUBLE)
-    g_value_set_double (&(node->data.value), value);
+  if (node->data.value == NULL)
+    node->data.value = json_value_init (json_value_alloc (), JSON_VALUE_DOUBLE);
   else
-    {
-      GValue copy = { 0, };
-
-      g_value_init (©, G_TYPE_DOUBLE);
-      g_value_set_double (©, value);
+    json_value_init (node->data.value, JSON_VALUE_DOUBLE);
 
-      json_node_set_value (node, ©);
-
-      g_value_unset (©);
-    }
+  json_value_set_double (node->data.value, value);
 }
 
 /**
@@ -703,8 +696,8 @@ json_node_get_double (JsonNode *node)
   if (JSON_NODE_TYPE (node) == JSON_NODE_NULL)
     return 0;
 
-  if (G_VALUE_TYPE (&(node->data.value)) == G_TYPE_DOUBLE)
-    return g_value_get_double (&(node->data.value));
+  if (JSON_VALUE_HOLDS_DOUBLE (node->data.value))
+    return json_value_get_double (node->data.value);
 
   return 0.0;
 }
@@ -724,19 +717,12 @@ json_node_set_boolean (JsonNode *node,
   g_return_if_fail (node != NULL);
   g_return_if_fail (JSON_NODE_TYPE (node) == JSON_NODE_VALUE);
 
-  if (G_VALUE_TYPE (&(node->data.value)) == G_TYPE_BOOLEAN)
-    g_value_set_boolean (&(node->data.value), value);
+  if (node->data.value == NULL)
+    node->data.value = json_value_init (json_value_alloc (), JSON_VALUE_BOOLEAN);
   else
-    {
-      GValue copy = { 0, };
+    json_value_init (node->data.value, JSON_VALUE_BOOLEAN);
 
-      g_value_init (©, G_TYPE_BOOLEAN);
-      g_value_set_boolean (©, value);
-
-      json_node_set_value (node, ©);
-
-      g_value_unset (©);
-    }
+  json_value_set_boolean (node->data.value, value);
 }
 
 /**
@@ -755,8 +741,8 @@ json_node_get_boolean (JsonNode *node)
   if (JSON_NODE_TYPE (node) == JSON_NODE_NULL)
     return FALSE;
 
-  if (G_VALUE_TYPE (&(node->data.value)) == G_TYPE_BOOLEAN)
-    return g_value_get_boolean (&(node->data.value));
+  if (JSON_VALUE_HOLDS_BOOLEAN (node->data.value))
+    return json_value_get_boolean (node->data.value);
 
   return FALSE;
 }
diff --git a/json-glib/json-path.c b/json-glib/json-path.c
index abcc505..350fab3 100644
--- a/json-glib/json-path.c
+++ b/json-glib/json-path.c
@@ -292,12 +292,7 @@ json_path_finalize (GObject *gobject)
 {
   JsonPath *self = JSON_PATH (gobject);
 
-#if GLIB_CHECK_VERSION (2, 28, 0)
   g_list_free_full (self->nodes, path_node_free);
-#else
-  g_list_foreach (self->nodes, (GFunc) path_node_free, NULL);
-  g_list_free (self->nodes);
-#endif
 
   G_OBJECT_CLASS (json_path_parent_class)->finalize (gobject);
 }
@@ -493,7 +488,7 @@ json_path_compile (JsonPath    *path,
                             g_set_error (error, JSON_PATH_ERROR,
                                          JSON_PATH_ERROR_INVALID_QUERY,
                                          _("Malformed slice expression '%*s'"),
-                                         end_p - p,
+                                         (int)(end_p - p),
                                          p + 1);
                             goto fail;
                           }
@@ -537,7 +532,7 @@ json_path_compile (JsonPath    *path,
                             g_set_error (error, JSON_PATH_ERROR,
                                          JSON_PATH_ERROR_INVALID_QUERY,
                                          _("Invalid set definition '%*s'"),
-                                         end_p - p,
+                                         (int)(end_p - p),
                                          p + 1);
                             goto fail;
                           }
@@ -590,7 +585,7 @@ json_path_compile (JsonPath    *path,
                         g_set_error (error, JSON_PATH_ERROR,
                                      JSON_PATH_ERROR_INVALID_QUERY,
                                      _("Invalid slice definition '%*s'"),
-                                     end_p - p,
+                                     (int)(end_p - p),
                                      p + 1);
                         goto fail;
                       }
@@ -618,7 +613,7 @@ json_path_compile (JsonPath    *path,
                     g_set_error (error, JSON_PATH_ERROR,
                                  JSON_PATH_ERROR_INVALID_QUERY,
                                  _("Invalid array index definition '%*s'"),
-                                 end_p - p,
+                                 (int)(end_p - p),
                                  p + 1);
                     goto fail;
                   }
@@ -711,14 +706,7 @@ json_path_compile (JsonPath    *path,
 #endif /* JSON_ENABLE_DEBUG */
 
   if (path->nodes != NULL)
-    {
-#if GLIB_CHECK_VERSION (2, 28, 0)
-      g_list_free_full (path->nodes, path_node_free);
-#else
-      g_list_foreach (path->nodes, (GFunc) path_node_free, NULL);
-      g_list_free (path->nodes);
-#endif
-    }
+    g_list_free_full (path->nodes, path_node_free);
 
   path->nodes = nodes;
   path->is_compiled = (path->nodes != NULL);
@@ -726,12 +714,7 @@ json_path_compile (JsonPath    *path,
   return path->nodes != NULL;
 
 fail:
-#if GLIB_CHECK_VERSION (2, 28, 0)
   g_list_free_full (nodes, path_node_free);
-#else
-  g_list_foreach (nodes, (GFunc) path_node_free, NULL);
-  g_list_free (nodes);
-#endif
 
   return FALSE;
 }
diff --git a/json-glib/json-scanner.h b/json-glib/json-scanner.h
index e3df02c..606934e 100644
--- a/json-glib/json-scanner.h
+++ b/json-glib/json-scanner.h
@@ -117,39 +117,58 @@ struct _JsonScanner
   JsonScannerMsgFunc msg_handler;
 };
 
+G_GNUC_INTERNAL
 JsonScanner *json_scanner_new                  (void);
+G_GNUC_INTERNAL
 void         json_scanner_destroy              (JsonScanner *scanner);
+G_GNUC_INTERNAL
 void         json_scanner_input_file           (JsonScanner *scanner,
                                                 gint         input_fd);
+G_GNUC_INTERNAL
 void         json_scanner_sync_file_offset     (JsonScanner *scanner);
+G_GNUC_INTERNAL
 void         json_scanner_input_text           (JsonScanner *scanner,
                                                 const gchar *text,
                                                 guint        text_len);
+G_GNUC_INTERNAL
 GTokenType   json_scanner_get_next_token       (JsonScanner *scanner);
+G_GNUC_INTERNAL
 GTokenType   json_scanner_peek_next_token      (JsonScanner *scanner);
+G_GNUC_INTERNAL
 GTokenType   json_scanner_cur_token            (JsonScanner *scanner);
+G_GNUC_INTERNAL
 GTokenValue  json_scanner_cur_value            (JsonScanner *scanner);
+G_GNUC_INTERNAL
 guint        json_scanner_cur_line             (JsonScanner *scanner);
+G_GNUC_INTERNAL
 guint        json_scanner_cur_position         (JsonScanner *scanner);
+G_GNUC_INTERNAL
 gboolean     json_scanner_eof                  (JsonScanner *scanner);
+G_GNUC_INTERNAL
 guint        json_scanner_set_scope            (JsonScanner *scanner,
                                                 guint        scope_id);
+G_GNUC_INTERNAL
 void         json_scanner_scope_add_symbol     (JsonScanner *scanner,
                                                 guint        scope_id,
                                                 const gchar *symbol,
                                                 gpointer     value);
+G_GNUC_INTERNAL
 void         json_scanner_scope_remove_symbol  (JsonScanner *scanner,
                                                 guint        scope_id,
                                                 const gchar *symbol);
+G_GNUC_INTERNAL
 gpointer     json_scanner_scope_lookup_symbol  (JsonScanner *scanner,
                                                 guint        scope_id,
                                                 const gchar *symbol);
+G_GNUC_INTERNAL
 void         json_scanner_scope_foreach_symbol (JsonScanner *scanner,
                                                 guint        scope_id,
                                                 GHFunc       func,
                                                 gpointer     user_data);
+G_GNUC_INTERNAL
 gpointer     json_scanner_lookup_symbol        (JsonScanner *scanner,
                                                 const gchar *symbol);
+G_GNUC_INTERNAL
 void         json_scanner_unexp_token          (JsonScanner *scanner,
                                                 GTokenType   expected_token,
                                                 const gchar *identifier_spec,
@@ -157,9 +176,11 @@ void         json_scanner_unexp_token          (JsonScanner *scanner,
                                                 const gchar *symbol_name,
                                                 const gchar *message,
                                                 gint         is_error);
+G_GNUC_INTERNAL
 void         json_scanner_error                (JsonScanner *scanner,
                                                 const gchar *format,
                                                 ...) G_GNUC_PRINTF (2,3);
+G_GNUC_INTERNAL
 void         json_scanner_warn                 (JsonScanner *scanner,
                                                 const gchar *format,
                                                 ...) G_GNUC_PRINTF (2,3);
diff --git a/json-glib/json-types-private.h b/json-glib/json-types-private.h
index e7f73f2..efce6a9 100644
--- a/json-glib/json-types-private.h
+++ b/json-glib/json-types-private.h
@@ -28,6 +28,17 @@
 
 G_BEGIN_DECLS
 
+typedef struct _JsonValue JsonValue;
+
+typedef enum {
+  JSON_VALUE_INVALID = 0,
+  JSON_VALUE_INT,
+  JSON_VALUE_DOUBLE,
+  JSON_VALUE_BOOLEAN,
+  JSON_VALUE_STRING,
+  JSON_VALUE_NULL
+} JsonValueType;
+
 struct _JsonNode
 {
   /*< private >*/
@@ -36,12 +47,37 @@ struct _JsonNode
   union {
     JsonObject *object;
     JsonArray *array;
-    GValue value;
+    JsonValue *value;
   } data;
 
   JsonNode *parent;
 };
 
+#define JSON_VALUE_INIT                 { JSON_VALUE_INVALID, 1, { 0 } }
+#define JSON_VALUE_INIT_TYPE(t)         { (t), 1, { 0 } }
+#define JSON_VALUE_IS_VALID(v)          ((v) != NULL && (v)->type != JSON_VALUE_INVALID)
+#define JSON_VALUE_HOLDS(v,t)           ((v) != NULL && (v)->type == (t))
+#define JSON_VALUE_HOLDS_INT(v)         (JSON_VALUE_HOLDS((v), JSON_VALUE_INT))
+#define JSON_VALUE_HOLDS_DOUBLE(v)      (JSON_VALUE_HOLDS((v), JSON_VALUE_DOUBLE))
+#define JSON_VALUE_HOLDS_BOOLEAN(v)     (JSON_VALUE_HOLDS((v), JSON_VALUE_BOOLEAN))
+#define JSON_VALUE_HOLDS_STRING(v)      (JSON_VALUE_HOLDS((v), JSON_VALUE_STRING))
+#define JSON_VALUE_HOLDS_NULL(v)        (JSON_VALUE_HOLDS((v), JSON_VALUE_NULL))
+#define JSON_VALUE_TYPE(v)              (json_value_type((v)))
+
+struct _JsonValue
+{
+  JsonValueType type;
+
+  volatile gint ref_count;
+
+  union {
+    gint64 v_int;
+    gdouble v_double;
+    gboolean v_bool;
+    gchar *v_str;
+  } data;
+};
+
 struct _JsonArray
 {
   GPtrArray *elements;
@@ -59,7 +95,47 @@ struct _JsonObject
   volatile gint ref_count;
 };
 
-const gchar *json_node_type_get_name (JsonNodeType node_type);
+G_GNUC_INTERNAL
+const gchar *   json_node_type_get_name         (JsonNodeType     node_type);
+G_GNUC_INTERNAL
+const gchar *   json_value_type_get_name        (JsonValueType    value_type);
+
+G_GNUC_INTERNAL
+GType           json_value_type                 (const JsonValue *value);
+
+G_GNUC_INTERNAL
+JsonValue *     json_value_alloc                (void);
+G_GNUC_INTERNAL
+JsonValue *     json_value_init                 (JsonValue       *value,
+                                                 JsonValueType    value_type);
+G_GNUC_INTERNAL
+JsonValue *     json_value_ref                  (JsonValue       *value);
+G_GNUC_INTERNAL
+void            json_value_unref                (JsonValue       *value);
+G_GNUC_INTERNAL
+void            json_value_unset                (JsonValue       *value);
+G_GNUC_INTERNAL
+void            json_value_free                 (JsonValue       *value);
+G_GNUC_INTERNAL
+void            json_value_set_int              (JsonValue       *value,
+                                                 gint64           v_int);
+G_GNUC_INTERNAL
+gint64          json_value_get_int              (const JsonValue *value);
+G_GNUC_INTERNAL
+void            json_value_set_double           (JsonValue       *value,
+                                                 gdouble          v_double);
+G_GNUC_INTERNAL
+gdouble         json_value_get_double           (const JsonValue *value);
+G_GNUC_INTERNAL
+void            json_value_set_boolean          (JsonValue       *value,
+                                                 gboolean         v_bool);
+G_GNUC_INTERNAL
+gboolean        json_value_get_boolean          (const JsonValue *value);
+G_GNUC_INTERNAL
+void            json_value_set_string           (JsonValue       *value,
+                                                 const gchar     *v_str);
+G_GNUC_INTERNAL
+const gchar *   json_value_get_string           (const JsonValue *value);
 
 G_END_DECLS
 
diff --git a/json-glib/json-types.h b/json-glib/json-types.h
index ecbf198..db9571e 100644
--- a/json-glib/json-types.h
+++ b/json-glib/json-types.h
@@ -32,6 +32,14 @@
 
 G_BEGIN_DECLS
 
+#ifdef JSON_DISABLE_DEPRECATION_WARNINGS
+#define JSON_DEPRECATED
+#define JSON_DEPRECATED_FOR(x)
+#else
+#define JSON_DEPRECATED         G_DEPRECATED
+#define JSON_DEPRECATED_FOR(x)  G_DEPRECATED_FOR(x)
+#endif
+
 /**
  * JSON_NODE_TYPE:
  * @node: a #JsonNode
@@ -225,11 +233,10 @@ JsonObject *          json_object_new                (void);
 JsonObject *          json_object_ref                (JsonObject  *object);
 void                  json_object_unref              (JsonObject  *object);
 
-#ifndef JSON_DISABLE_DEPRECATED
+JSON_DEPRECATED_FOR(json_object_set_member)
 void                  json_object_add_member         (JsonObject  *object,
                                                       const gchar *member_name,
-                                                      JsonNode    *node) G_GNUC_DEPRECATED;
-#endif /* JSON_DISABLE_DEPRECATED */
+                                                      JsonNode    *node);
 
 void                  json_object_set_member         (JsonObject  *object,
                                                       const gchar *member_name,
diff --git a/json-glib/json-value.c b/json-glib/json-value.c
new file mode 100644
index 0000000..7e9babd
--- /dev/null
+++ b/json-glib/json-value.c
@@ -0,0 +1,216 @@
+/* json-value.c - JSON value container
+ * 
+ * This file is part of JSON-GLib
+ * Copyright (C) 2012  Emmanuele Bassi 
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see .
+ *
+ * Author:
+ *   Emmanuele Bassi  
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include 
+
+#include "json-types-private.h"
+
+const gchar *
+json_value_type_get_name (JsonValueType value_type)
+{
+  switch (value_type)
+    {
+    case JSON_VALUE_INVALID:
+      return "Unset";
+
+    case JSON_VALUE_INT:
+      return "Integer";
+
+    case JSON_VALUE_DOUBLE:
+      return "Floating Point";
+
+    case JSON_VALUE_BOOLEAN:
+      return "Boolean";
+
+    case JSON_VALUE_STRING:
+      return "String";
+
+    case JSON_VALUE_NULL:
+      return "Null";
+    }
+
+  return "Undefined";
+}
+
+GType
+json_value_type (const JsonValue *value)
+{
+  switch (value->type)
+    {
+    case JSON_VALUE_INVALID:
+      return G_TYPE_INVALID;
+
+    case JSON_VALUE_INT:
+      return G_TYPE_INT64;
+
+    case JSON_VALUE_DOUBLE:
+      return G_TYPE_DOUBLE;
+
+    case JSON_VALUE_BOOLEAN:
+      return G_TYPE_BOOLEAN;
+
+    case JSON_VALUE_STRING:
+      return G_TYPE_STRING;
+
+    case JSON_VALUE_NULL:
+      return G_TYPE_INVALID;
+    }
+
+  return G_TYPE_INVALID;
+}
+
+JsonValue *
+json_value_alloc (void)
+{
+  JsonValue *res = g_slice_new0 (JsonValue);
+
+  res->ref_count = 1;
+
+  return res;
+}
+
+JsonValue *
+json_value_init (JsonValue     *value,
+                 JsonValueType  value_type)
+{
+  g_return_val_if_fail (value != NULL, NULL);
+
+  if (value->type != JSON_VALUE_INVALID)
+    json_value_unset (value);
+
+  value->type = value_type;
+
+  return value;
+}
+
+JsonValue *
+json_value_ref (JsonValue *value)
+{
+  g_return_val_if_fail (value != NULL, NULL);
+
+  g_atomic_int_add (&value->ref_count, 1);
+
+  return value;
+}
+
+void
+json_value_unref (JsonValue *value)
+{
+  g_return_if_fail (value != NULL);
+
+  if (g_atomic_int_dec_and_test (&value->ref_count))
+    json_value_free (value);
+}
+
+void
+json_value_unset (JsonValue *value)
+{
+  g_return_if_fail (value != NULL);
+
+  switch (value->type)
+    {
+    case JSON_VALUE_INVALID:
+      break;
+
+    case JSON_VALUE_INT:
+      value->data.v_int = 0;
+      break;
+
+    case JSON_VALUE_DOUBLE:
+      value->data.v_double = 0.0;
+      break;
+
+    case JSON_VALUE_BOOLEAN:
+      value->data.v_bool = FALSE;
+      break;
+
+    case JSON_VALUE_STRING:
+      g_free (value->data.v_str);
+      value->data.v_str = NULL;
+      break;
+
+    case JSON_VALUE_NULL:
+      break;
+    }
+}
+
+void
+json_value_free (JsonValue *value)
+{
+  if (G_LIKELY (value != NULL))
+    {
+      json_value_unset (value);
+      g_slice_free (JsonValue, value);
+    }
+}
+
+#define _JSON_VALUE_DEFINE_SET(Type,EType,CType,VField) \
+void \
+json_value_set_##Type (JsonValue *value, CType VField) \
+{ \
+  g_return_if_fail (JSON_VALUE_IS_VALID (value)); \
+  g_return_if_fail (JSON_VALUE_HOLDS (value, JSON_VALUE_##EType)); \
+\
+  value->data.VField = VField; \
+\
+}
+
+#define _JSON_VALUE_DEFINE_GET(Type,EType,CType,VField) \
+CType \
+json_value_get_##Type (const JsonValue *value) \
+{ \
+  g_return_val_if_fail (JSON_VALUE_IS_VALID (value), 0); \
+  g_return_val_if_fail (JSON_VALUE_HOLDS (value, JSON_VALUE_##EType), 0); \
+\
+  return value->data.VField; \
+}
+
+#define _JSON_VALUE_DEFINE_SET_GET(Type,EType,CType,VField) \
+_JSON_VALUE_DEFINE_SET(Type,EType,CType,VField) \
+_JSON_VALUE_DEFINE_GET(Type,EType,CType,VField)
+
+_JSON_VALUE_DEFINE_SET_GET(int, INT, gint64, v_int)
+
+_JSON_VALUE_DEFINE_SET_GET(double, DOUBLE, gdouble, v_double)
+
+_JSON_VALUE_DEFINE_SET_GET(boolean, BOOLEAN, gboolean, v_bool)
+
+void
+json_value_set_string (JsonValue *value,
+                       const gchar *v_str)
+{
+  g_return_if_fail (JSON_VALUE_IS_VALID (value));
+  g_return_if_fail (JSON_VALUE_HOLDS_STRING (value));
+
+  g_free (value->data.v_str);
+  value->data.v_str = g_strdup (v_str);
+}
+
+_JSON_VALUE_DEFINE_GET(string, STRING, const gchar *, v_str)
+
+#undef _JSON_VALUE_DEFINE_SET_GET
+#undef _JSON_VALUE_DEFINE_GET
+#undef _JSON_VALUE_DEFINE_SET
diff --git a/json-glib/json-version.h b/json-glib/json-version.h
index 49d1853..9c29187 100644
--- a/json-glib/json-version.h
+++ b/json-glib/json-version.h
@@ -48,7 +48,7 @@
  *
  * Json minor version component (e.g. 2 if %JSON_VERSION is 1.2.3)
  */
-#define JSON_MINOR_VERSION              (14)
+#define JSON_MINOR_VERSION              (15)
 
 /**
  * JSON_MICRO_VERSION:
@@ -62,7 +62,7 @@
  *
  * Json version.
  */
-#define JSON_VERSION                    (0.14.2)
+#define JSON_VERSION                    (0.15.2)
 
 /**
  * JSON_VERSION_S:
@@ -70,7 +70,7 @@
  * Json version, encoded as a string, useful for printing and
  * concatenation.
  */
-#define JSON_VERSION_S                  "0.14.2"
+#define JSON_VERSION_S                  "0.15.2"
 
 /**
  * JSON_VERSION_HEX:
diff --git a/json-glib/tests/Makefile.in b/json-glib/tests/Makefile.in
index 2d4ef9a..fd21cf2 100644
--- a/json-glib/tests/Makefile.in
+++ b/json-glib/tests/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -83,8 +83,8 @@ array_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
 array_DEPENDENCIES = ../libjson-glib-1.0.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 boxed_SOURCES = boxed.c
 boxed_OBJECTS = boxed.$(OBJEXT)
@@ -156,21 +156,21 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = array.c boxed.c builder.c generator.c gvariant.c node.c \
 	object.c parser.c path.c reader.c serialize-complex.c \
@@ -207,11 +207,10 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-GCOV_CFLAGS = @GCOV_CFLAGS@
-GCOV_LDFLAGS = @GCOV_LDFLAGS@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
@@ -243,6 +242,8 @@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 JSON_CFLAGS = @JSON_CFLAGS@
 JSON_DEBUG_CFLAGS = @JSON_DEBUG_CFLAGS@
+JSON_GCOV_CFLAGS = @JSON_GCOV_CFLAGS@
+JSON_GCOV_LDADD = @JSON_GCOV_LDADD@
 JSON_LIBS = @JSON_LIBS@
 JSON_LT_LDFLAGS = @JSON_LT_LDFLAGS@
 JSON_MAJOR_VERSION = @JSON_MAJOR_VERSION@
@@ -262,6 +263,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+LTP = @LTP@
+LTP_GENHTML = @LTP_GENHTML@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -291,6 +294,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SHTOOL = @SHTOOL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@@ -403,6 +407,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/build/autotools/Makefile.am.gtest $(top_srcdir)/build/autotools/Makefile.am.silent:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -421,43 +426,43 @@ clean-noinstPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-array$(EXEEXT): $(array_OBJECTS) $(array_DEPENDENCIES) 
+array$(EXEEXT): $(array_OBJECTS) $(array_DEPENDENCIES) $(EXTRA_array_DEPENDENCIES) 
 	@rm -f array$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(array_OBJECTS) $(array_LDADD) $(LIBS)
-boxed$(EXEEXT): $(boxed_OBJECTS) $(boxed_DEPENDENCIES) 
+boxed$(EXEEXT): $(boxed_OBJECTS) $(boxed_DEPENDENCIES) $(EXTRA_boxed_DEPENDENCIES) 
 	@rm -f boxed$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(boxed_OBJECTS) $(boxed_LDADD) $(LIBS)
-builder$(EXEEXT): $(builder_OBJECTS) $(builder_DEPENDENCIES) 
+builder$(EXEEXT): $(builder_OBJECTS) $(builder_DEPENDENCIES) $(EXTRA_builder_DEPENDENCIES) 
 	@rm -f builder$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(builder_OBJECTS) $(builder_LDADD) $(LIBS)
-generator$(EXEEXT): $(generator_OBJECTS) $(generator_DEPENDENCIES) 
+generator$(EXEEXT): $(generator_OBJECTS) $(generator_DEPENDENCIES) $(EXTRA_generator_DEPENDENCIES) 
 	@rm -f generator$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(generator_OBJECTS) $(generator_LDADD) $(LIBS)
-gvariant$(EXEEXT): $(gvariant_OBJECTS) $(gvariant_DEPENDENCIES) 
+gvariant$(EXEEXT): $(gvariant_OBJECTS) $(gvariant_DEPENDENCIES) $(EXTRA_gvariant_DEPENDENCIES) 
 	@rm -f gvariant$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(gvariant_OBJECTS) $(gvariant_LDADD) $(LIBS)
-node$(EXEEXT): $(node_OBJECTS) $(node_DEPENDENCIES) 
+node$(EXEEXT): $(node_OBJECTS) $(node_DEPENDENCIES) $(EXTRA_node_DEPENDENCIES) 
 	@rm -f node$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(node_OBJECTS) $(node_LDADD) $(LIBS)
-object$(EXEEXT): $(object_OBJECTS) $(object_DEPENDENCIES) 
+object$(EXEEXT): $(object_OBJECTS) $(object_DEPENDENCIES) $(EXTRA_object_DEPENDENCIES) 
 	@rm -f object$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(object_OBJECTS) $(object_LDADD) $(LIBS)
-parser$(EXEEXT): $(parser_OBJECTS) $(parser_DEPENDENCIES) 
+parser$(EXEEXT): $(parser_OBJECTS) $(parser_DEPENDENCIES) $(EXTRA_parser_DEPENDENCIES) 
 	@rm -f parser$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(parser_OBJECTS) $(parser_LDADD) $(LIBS)
-path$(EXEEXT): $(path_OBJECTS) $(path_DEPENDENCIES) 
+path$(EXEEXT): $(path_OBJECTS) $(path_DEPENDENCIES) $(EXTRA_path_DEPENDENCIES) 
 	@rm -f path$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(path_OBJECTS) $(path_LDADD) $(LIBS)
-reader$(EXEEXT): $(reader_OBJECTS) $(reader_DEPENDENCIES) 
+reader$(EXEEXT): $(reader_OBJECTS) $(reader_DEPENDENCIES) $(EXTRA_reader_DEPENDENCIES) 
 	@rm -f reader$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(reader_OBJECTS) $(reader_LDADD) $(LIBS)
-serialize-complex$(EXEEXT): $(serialize_complex_OBJECTS) $(serialize_complex_DEPENDENCIES) 
+serialize-complex$(EXEEXT): $(serialize_complex_OBJECTS) $(serialize_complex_DEPENDENCIES) $(EXTRA_serialize_complex_DEPENDENCIES) 
 	@rm -f serialize-complex$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(serialize_complex_OBJECTS) $(serialize_complex_LDADD) $(LIBS)
-serialize-full$(EXEEXT): $(serialize_full_OBJECTS) $(serialize_full_DEPENDENCIES) 
+serialize-full$(EXEEXT): $(serialize_full_OBJECTS) $(serialize_full_DEPENDENCIES) $(EXTRA_serialize_full_DEPENDENCIES) 
 	@rm -f serialize-full$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(serialize_full_OBJECTS) $(serialize_full_LDADD) $(LIBS)
-serialize-simple$(EXEEXT): $(serialize_simple_OBJECTS) $(serialize_simple_DEPENDENCIES) 
+serialize-simple$(EXEEXT): $(serialize_simple_OBJECTS) $(serialize_simple_DEPENDENCIES) $(EXTRA_serialize_simple_DEPENDENCIES) 
 	@rm -f serialize-simple$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(serialize_simple_OBJECTS) $(serialize_simple_LDADD) $(LIBS)
 
@@ -484,26 +489,23 @@ distclean-compile:
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -608,10 +610,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/json-glib/tests/node.c b/json-glib/tests/node.c
index 0c2fd9b..a50d980 100644
--- a/json-glib/tests/node.c
+++ b/json-glib/tests/node.c
@@ -3,6 +3,50 @@
 #include 
 
 static void
+test_init_int (void)
+{
+  JsonNode *node = json_node_new (JSON_NODE_VALUE);
+
+  json_node_set_int (node, 42);
+  g_assert_cmpint (json_node_get_int (node), ==, 42);
+
+  json_node_free (node);
+}
+
+static void
+test_init_double (void)
+{
+  JsonNode *node = json_node_new (JSON_NODE_VALUE);
+
+  json_node_set_double (node, 3.14159);
+  g_assert_cmpfloat (json_node_get_double (node), ==, 3.14159);
+
+  json_node_free (node);
+}
+
+static void
+test_init_boolean (void)
+{
+  JsonNode *node = json_node_new (JSON_NODE_VALUE);
+
+  json_node_set_boolean (node, TRUE);
+  g_assert (json_node_get_boolean (node));
+
+  json_node_free (node);
+}
+
+static void
+test_init_string (void)
+{
+  JsonNode *node = json_node_new (JSON_NODE_VALUE);
+
+  json_node_set_string (node, "Hello, World");
+  g_assert_cmpstr (json_node_get_string (node), ==, "Hello, World");
+
+  json_node_free (node);
+}
+
+static void
 test_copy_null (void)
 {
   JsonNode *node = json_node_new (JSON_NODE_NULL);
@@ -61,6 +105,7 @@ test_null (void)
   JsonNode *node = json_node_new (JSON_NODE_NULL);
 
   g_assert (JSON_NODE_HOLDS_NULL (node));
+  g_assert (json_node_is_null (node));
   g_assert_cmpint (json_node_get_value_type (node), ==, G_TYPE_INVALID);
   g_assert_cmpstr (json_node_type_name (node), ==, "NULL");
 
@@ -68,7 +113,7 @@ test_null (void)
 }
 
 static void
-test_value (void)
+test_gvalue (void)
 {
   JsonNode *node = json_node_new (JSON_NODE_VALUE);
   GValue value = { 0, };
@@ -92,6 +137,75 @@ test_value (void)
 
   g_value_unset (&value);
   g_value_unset (&check);
+
+  g_value_init (&value, G_TYPE_STRING);
+  g_value_set_string (&value, "Hello, World!");
+
+  g_assert_cmpint (G_VALUE_TYPE (&value), ==, G_TYPE_STRING);
+  g_assert_cmpstr (g_value_get_string (&value), ==, "Hello, World!");
+
+  json_node_set_value (node, &value);
+  json_node_get_value (node, &check);
+
+  g_assert_cmpint (G_VALUE_TYPE (&value), ==, G_VALUE_TYPE (&check));
+  g_assert_cmpstr (g_value_get_string (&value), ==, g_value_get_string (&check));
+  g_assert_cmpint (G_VALUE_TYPE (&check), ==, G_TYPE_STRING);
+  g_assert_cmpstr (g_value_get_string (&check), ==, "Hello, World!");
+
+  g_value_unset (&value);
+  g_value_unset (&check);
+  json_node_free (node);
+}
+
+static void
+test_gvalue_autopromotion (void)
+{
+  JsonNode *node = json_node_new (JSON_NODE_VALUE);
+  GValue value = { 0, };
+  GValue check = { 0, };
+
+  g_assert_cmpint (JSON_NODE_TYPE (node), ==, JSON_NODE_VALUE);
+
+  if (g_test_verbose ())
+    g_print ("Autopromotion of int to int64\n");
+
+  g_value_init (&value, G_TYPE_INT);
+  g_value_set_int (&value, 42);
+
+  json_node_set_value (node, &value);
+  json_node_get_value (node, &check);
+
+  if (g_test_verbose ())
+    g_print ("Expecting an gint64, got a %s\n", g_type_name (G_VALUE_TYPE (&check)));
+
+  g_assert_cmpint (G_VALUE_TYPE (&check), ==, G_TYPE_INT64);
+  g_assert_cmpint (g_value_get_int64 (&check), ==, 42);
+  g_assert_cmpint (G_VALUE_TYPE (&value), !=, G_VALUE_TYPE (&check));
+  g_assert_cmpint ((gint64) g_value_get_int (&value), ==, g_value_get_int64 (&check));
+
+  g_value_unset (&value);
+  g_value_unset (&check);
+
+  if (g_test_verbose ())
+    g_print ("Autopromotion of float to double\n");
+
+  g_value_init (&value, G_TYPE_FLOAT);
+  g_value_set_float (&value, 3.14159f);
+
+  json_node_set_value (node, &value);
+  json_node_get_value (node, &check);
+
+  if (g_test_verbose ())
+    g_print ("Expecting a gdouble, got a %s\n", g_type_name (G_VALUE_TYPE (&check))); 
+
+  g_assert_cmpint (G_VALUE_TYPE (&check), ==, G_TYPE_DOUBLE);
+  g_assert_cmpfloat ((float) g_value_get_double (&check), ==, 3.14159f);
+  g_assert_cmpint (G_VALUE_TYPE (&value), !=, G_VALUE_TYPE (&check));
+  g_assert_cmpfloat ((gdouble) g_value_get_float (&value), ==, g_value_get_double (&check));
+
+  g_value_unset (&value);
+  g_value_unset (&check);
+
   json_node_free (node);
 }
 
@@ -102,11 +216,16 @@ main (int   argc,
   g_type_init ();
   g_test_init (&argc, &argv, NULL);
 
-  g_test_add_func ("/nodes/null-node", test_null);
-  g_test_add_func ("/nodes/copy-null", test_copy_null);
-  g_test_add_func ("/nodes/copy-value", test_copy_value);
-  g_test_add_func ("/nodes/copy-object", test_copy_object);
-  g_test_add_func ("/nodes/value", test_value);
+  g_test_add_func ("/nodes/init/int", test_init_int);
+  g_test_add_func ("/nodes/init/double", test_init_double);
+  g_test_add_func ("/nodes/init/boolean", test_init_boolean);
+  g_test_add_func ("/nodes/init/string", test_init_string);
+  g_test_add_func ("/nodes/init/null", test_null);
+  g_test_add_func ("/nodes/copy/null", test_copy_null);
+  g_test_add_func ("/nodes/copy/value", test_copy_value);
+  g_test_add_func ("/nodes/copy/object", test_copy_object);
+  g_test_add_func ("/nodes/gvalue", test_gvalue);
+  g_test_add_func ("/nodes/gvalue/autopromotion", test_gvalue_autopromotion);
 
   return g_test_run ();
 }
diff --git a/json-glib/tests/object.c b/json-glib/tests/object.c
index 2f00078..513e6b8 100644
--- a/json-glib/tests/object.c
+++ b/json-glib/tests/object.c
@@ -88,6 +88,7 @@ static const struct {
   { "integer", JSON_NODE_VALUE, G_TYPE_INT64 },
   { "boolean", JSON_NODE_VALUE, G_TYPE_BOOLEAN },
   { "string", JSON_NODE_VALUE, G_TYPE_STRING },
+  { "double", JSON_NODE_VALUE, G_TYPE_DOUBLE },
   { "null", JSON_NODE_NULL, G_TYPE_INVALID }
 };
 
@@ -122,6 +123,7 @@ test_foreach_member (void)
   json_object_set_int_member (object, "integer", 42);
   json_object_set_boolean_member (object, "boolean", TRUE);
   json_object_set_string_member (object, "string", "hello");
+  json_object_set_double_member (object, "double", 3.14159);
   json_object_set_null_member (object, "null");
 
   json_object_foreach_member (object, verify_foreach, &fixture);
diff --git a/po/cs.gmo b/po/cs.gmo
new file mode 100644
index 0000000000000000000000000000000000000000..42b26ac470e3c9a4431e39792e61945fa793c201
GIT binary patch
literal 4170
zcmb7GON<;x87?5amJosom^VKbo87hDvom8SHe*k0v$2tJcD-`eK5&7W?%J95bXSe4
zx+j@A1&%1@#vvGx_6X7{AVs;^m)Vt&2nP;GoDk$lP8>LJL41GJJa(O3XERdI*WFeB
z>-)c|>c1a*;uiwHZ{hknu4g_X#1inykKzx%-vhq{`~&bh@Q=U-@Yu(M_%?7A_*I|*
zeh2t7Ap3a}_)XwDz*E5YfX9HxpAdq8CxOoaZvf8%e*)yVZv&qP{sVX#c>Lob?u)=C
zo_`Lk0p9_h2mTLO1)lqa5OrV&$m93N&wmD^-mzz`P65GSOlH|&I31qCxAmB^Ym-rmw|r+G9UjQ
zzkm8kAu4#j0p$9JK%W05@Eq`8K<4|zXG7f?@G_o%2fPA&56E>zPX!(%ka_qeFarJw
zxD5O+a0R&ZIU%kAbKqs*Tfo!6{{XrE6Hg0)vVBbefp!TD36$x1z_9;uufK-t)3{KI
z0Q~}z5TD0&92e*oNKJeZ7ym%xz8`bIT0?nW4`{Ra3NEB6p20QwvF7-P_J}X|yTGHE
zca8a^LF>{wMao)Z8#M3475e@iX;Y~SO47JUjh1#mN*Db9YEQ+5BS}Aa`Q{p#)?GZ(
zD{0Zekc^9LKt?OdRo+roT=lb4-QGX{G_}ftijE>{OhMWtic&{rlZru4(U0fdf|#Zd
zXVN)Zn2#4Qu^?CWdd3zi5!ZEJW@$1@)}?JNi_)s;khE3~DAkF2l@hg?>XfU2vy+H0
zv3Ck}9y*w%v3ksKVYxaaQYwm#?kijHi^5FP5}v3;7LsdJd9N6VRhexXo2!JJ_YYRB
za&DH}YKkZLi8JHT4f2-BXklpq)p+Kn{1jy`Q=T|6u~M1J(Jsexee}Qsl0u3cnDdk5
zEybD%4Um1AX0ioeGV~@ct%VorAqA#Q+|=Xl?(3S&GV=;5L98H(b?L=0sYu+K_IT5b
z=eD>hp?h&hTIfbu-(s-=QA`3qs*45aB1lIfmT#@Gg!_pKCHVDtB4Rq#q?UO{8x
zOOrv&2bXiO#kd(C&LptzZNmCom`@;XM{TPl%c1Bnvyg*Jhsy5_xDQ=FM4+MPAHv(X
z^N)2GcCx?`vg0ktZx%uEoZkm|xveLnggOf=>EPul_RQm+jYE!CFs}u%ZVhj@(e)&{
zqbzS14Z7=$j@nt;qFg%gHg`+${ur&gcA7-rE88yGFb(PyMX#~E+$!6{G|ObAtxc{f
z#eo*-QGB3jd+dbL)Ms?SGfs#JTfQLmn=
z)~Z!ZjBcrZ%4yB!)uLK0s@JJjZPdRT=DmbGqYW#y%Vfbv&Z@MkOFOSCt4-V;J)ny@
zzqy=Ct%^!Kd|~b-soSM&t7t>Xyg@5N6?f>OuOW(El%=k?JgsOpy+N^?TfM$|bw*dM
zQk`2dC|M&1u-u>mOHtS!+cs#1d%^$X29J^L)_i_NqAvWA!S3v-iGc%?IF
zNgDRB8=C%TOOLkwVf@3<)=sqSbClf4GJMcC{e^(@}*+^4%L
zfk{p~_cEnbE^f{YaNx6U$2O-)V&CtY-8Ym*@CQ^5RR(k3JW6`^wcpIUcVGLJ*w}qz
zw4KOV20RjDgtS5+oD>PP=d+h$O@Y)xBe}`BJTu%g7*1ZCv3}i_@PSO&?@1qW=4CoD
z*Jk%&st1psg;Itg^+z3bOoCO6xVRSRPcAk(N-4PFihig+>*yeBPmMy-rsZU(44R*w?2A~A{Uq%h2PJRQSUO94
z!yoLxAN0tZPx-|}VN*%99{m, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: json-glib master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
+"glib\n"
+"POT-Creation-Date: 2012-06-30 15:20+0100\n"
+"PO-Revision-Date: 2011-11-22 10:29+0100\n"
+"Last-Translator: Marek Černocký \n"
+"Language-Team: Czech \n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: json-glib/json-gobject.c:934
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "Očekává se objekt JSON, ale kořenový uzel je typu „%s“"
+
+#: json-glib/json-gvariant.c:539
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Neočekávaný typ „%s“ v uzlu JSON"
+
+#: json-glib/json-gvariant.c:609
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "Schází prvky v poli JSON, aby to byla n-tice"
+
+#: json-glib/json-gvariant.c:637
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Schází uzavírací symbol „)“ v typu n-tice GVariant"
+
+#: json-glib/json-gvariant.c:645
+msgid "Unexpected extra elements in JSON array"
+msgstr "Neočekávané dodatečné prvky v poli JSON"
+
+#: json-glib/json-gvariant.c:924
+msgid "Invalid string value converting to GVariant"
+msgstr "Neplatná hodnota typu řetězec převáděná na GVariant"
+
+#: json-glib/json-gvariant.c:980
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr "Záznam slovníku GVariant očekává objekt JSON s právě jedním členem"
+
+#: json-glib/json-gvariant.c:1236
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "Třída GVariant „%c“ není podporována"
+
+#: json-glib/json-gvariant.c:1281
+msgid "Invalid GVariant signature"
+msgstr "Neplatná signatura GVariant"
+
+#: json-glib/json-gvariant.c:1326
+msgid "JSON data is empty"
+msgstr "Data JSON jsou prázdná"
+
+#: json-glib/json-parser.c:818
+#, c-format
+msgid "%s:%d: Parse error: %s"
+msgstr "%s:%d: Chyba zpracování: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "Ve výrazu JSONPath je dovolen pouze jeden kořenový uzel"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "Kořenový uzel následován neplatným znakem „%c“"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Chybný výraz řezu „%*s“"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Neplatná definice množiny „%*s“"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Neplatná definice řezu „%*s“"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Neplatná definice indexu pole „%*s“"
+
+#: json-glib/json-reader.c:463
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "Aktuální uzel je typu „%s“, ale bylo očekáváno pole nebo objekt."
+
+#: json-glib/json-reader.c:475
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "Index „%d“ je větší než velikost pole na aktuální pozici."
+
+#: json-glib/json-reader.c:492
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "Index „%d“ je větší než velikost objektu na aktuální pozici."
+
+#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
+#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
+#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
+#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
+#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+msgid "No node available at the current position"
+msgstr "Na aktuální pozici není k dispozici žádný uzel"
+
+#: json-glib/json-reader.c:583
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "Aktuální pozice obsahuje „%s“ a ne pole"
+
+#: json-glib/json-reader.c:646
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "Aktuální uzel je typu „%s“, ale byl očekáván objekt."
+
+#: json-glib/json-reader.c:653
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "Člen „%s“ není na aktuálním pozici v objektu definován."
+
+#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "Aktuální pozice obsahuje „%s“ a ne objekt"
+
+#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
+#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
+#: json-glib/json-reader.c:1000
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "Aktuální pozice obsahuje „%s“ a ne hodnotu"
+
+#: json-glib/json-reader.c:873
+msgid "The current position does not hold an integer type"
+msgstr "Aktuální pozice neobsahuje typ integer (celé číslo)"
+
+#: json-glib/json-reader.c:918
+msgid "The current position does not hold a floating point type"
+msgstr "Aktuální pozice neobsahuje typ float point (desetinné číslo)"
+
+#: json-glib/json-reader.c:963
+msgid "The current position does not hold a string type"
+msgstr "Aktuální pozice neobsahuje typ string (řetězec)"
+
+#: json-glib/json-reader.c:1008
+msgid "The current position does not hold a boolean type"
+msgstr "Aktuální pozice neobsahuje typ boolean (pravdivostní hodnota)"
diff --git a/po/de.gmo b/po/de.gmo
new file mode 100644
index 0000000000000000000000000000000000000000..6556f38070cb74b46b7c92949ad8ca73a2c14e11
GIT binary patch
literal 4314
zcmbtX&vP6{6>gG1f(Q_l1oN8?6`|PitafF`an?~{IaXAPtsmHHrz#iHJJXt-sHc0Y
zyT^*QxBxc}$%&#U4qS5c0Vt|+u}>03aR>)aRB@o-!i59>0mb*aXLco!Y^j)1@3*tl
z{rbJ{ef{3(uhWnHl;Qd|#y2pY`4nTPfloey4_v(S@SnhG;Hk$LA3Gz
z-~#SH0Cs?%051an4QvBn{tRRDzyXk+|DwMCBk&yV+2imPa2~h@{1I>o_$S~j@YEAA
zp4WlD2L}R3{=YEA*!O_Tz-8difi2+QffVOcpTitr0-OQf29muW04ctYfX@K`0{jl}
zU%*Si=_eVx3|s?J{2u}-zTW{~20rq6#(KamkoNr$NbCMw^0o41787t01Wv7
zF5-Uri;P_X_JC`^p8?l_{{UVGUU-VJIpB|h-v#~_h_FLU0EToiOl1g@eG>zZ!$rCN
zI>u))5DEkR43c19!Z?Kix*1$#&tlL88V_8=DQOL120b9n?5h}XJMaVu7io^J$1$D`
z-x&J};f(9fWL>@?tdm??YiyU#IJU@_Zwp%p?Ri$DzA#$Y9WJ$}&-aHi^^Obv*3I=b
zZu;-xmTwn+fJY+rYKI#wc`3`jv}`HNE_8ly{#o9yJof|1tudZ!lSy7UZZ^5!8A|@{
zjGJX+7g8mh
zMcSDB6FjVBYbGW@+!2Kmeb^E)H)&-ptneXRAllfvuCsd}YeFfrjYzOp6vc)JVrU{_
zH^w>MH1*s*B_(Dr9S95ENE=ejdJsjk@qg=L7P^Si5!frF)>w}3jS2<$4T_Ul>-d%)
zy1F5NXGXdp!hum4qU{@_B=#rO9@y{56`RV4AdsOcK<)7tx+t_`FVG;^%N(>Gy@aBm
zlT5sV#w>&;qL>d4=kOJEGETN6vL4pN^Eo?{LEMh#Rtl1X9}u&UgDXZd)CPQySwBLc
zG3O_+R%iZ!=3*s_9Kky(L7`Yg#gl&zvvNx}qJ%oV75wny$@a~ooYh;_Cz#Fx+pvbp
zZL*Rjx22_W(dF+sqmx_}eO?L&-llFys*lO4%Zn_zQspk`nJyoAKkUxU^{aeTC?#6C
zHl=JCo6q5hOZ$C1Xr+1a`p}xJO8vsv?9|43FL{G$Gm`$BTA%{wo3
z=i4u~JMA_mCO71rg4~+S>m(igo#UMg-Se-+dDr1*(z8N4B|Np9RWuvJuc*C`JX|S-
z*8J6yerxrWkj-zG^AZKBm74Oksp~@LmB?k%lcMbM<*(m6~Hl#K0n36->|
z?&R!97U@72PU1vck)u&>3p7B_@k1!@$vV35mgi;Rc`mi6=!q=(YT+RabV{;FeW01R
zU0HP8#?DzT(5pd@yXgKFwF6Fi
zUXhrb-@ETe9)iyI?kiv9auUzYx<~JSxJacuS-~+$u1@+ejGv)R_gUG!hlK3jefTVD
zst=oI`8!0c)LSGmy^YSzN0ptpdaK+e2dgmry6f9n|t^3zOZa1
zZbm(P5)RGRpoW%UjF8cTT9H^r)YR7sVpn00bVh7U
z{Egn>Ee6|11=dm}KO!5bik8>%Kd97M#C$C
zgRDY856HnGYnK&@!ImjYLFMRVYY%AogsdGq
zgo!1HB#TBug8wfIF`q#PE8$-NIGf?tRuF

literal 0
HcmV?d00001

diff --git a/po/de.po b/po/de.po
new file mode 100644
index 0000000..835399d
--- /dev/null
+++ b/po/de.po
@@ -0,0 +1,175 @@
+# German translation for json-glib.
+# Copyright (C) 2011 json-glib's COPYRIGHT HOLDER
+# This file is distributed under the same license as the json-glib package.
+# Mario Blättermann , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: json-glib master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
+"glib\n"
+"POT-Creation-Date: 2012-06-30 15:20+0100\n"
+"PO-Revision-Date: 2011-11-13 16:49+0100\n"
+"Last-Translator: Mario Blättermann \n"
+"Language-Team: German \n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: json-glib/json-gobject.c:934
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "Ein JSON-Objekt wurde erwartet, aber der Root-Knoten hat den Typ »%s«"
+
+#: json-glib/json-gvariant.c:539
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Unerwarteter Typ »%s« im JSON-Knoten"
+
+#: json-glib/json-gvariant.c:609
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "Elemente im JSON-Array fehlen, um konform zu einem Tupel zu sein"
+
+#: json-glib/json-gvariant.c:637
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Schließende Klammer »)« im Typ des GVariant-Tupels fehlt"
+
+#: json-glib/json-gvariant.c:645
+msgid "Unexpected extra elements in JSON array"
+msgstr "Unerwartete zusätzliche Elemente im JSON-Array"
+
+#: json-glib/json-gvariant.c:924
+msgid "Invalid string value converting to GVariant"
+msgstr "Ungültiger Zeichenkettenwert zur GVariant-Umwandlung"
+
+#: json-glib/json-gvariant.c:980
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+"Ein GVariant-Verzeichniseintrag erwartet ein JSON-Objekt mit genau einem "
+"Mitglied"
+
+#: json-glib/json-gvariant.c:1236
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "GVariant-Klasse »%c« wird nicht unterstützt"
+
+#: json-glib/json-gvariant.c:1281
+msgid "Invalid GVariant signature"
+msgstr "Ungültige GVariant-Signatur"
+
+#: json-glib/json-gvariant.c:1326
+msgid "JSON data is empty"
+msgstr "JSON-Daten sind leer"
+
+#: json-glib/json-parser.c:818
+#, c-format
+msgid "%s:%d: Parse error: %s"
+msgstr "%s:%d: Verarbeitungsfehler: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "Im JSONPath-Ausdruck ist nur ein einziger Root-Knoten erlaubt"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "Auf den Root-Knoten folgt das ungültige Zeichen »%c«"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Ungültiger Slice-Ausdruck »%*s«"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Ungültige »set«-Definition »%*s«"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Ungültige »slice«-Definition »%*s«"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Ungültige Array-Inex-Definition »%*s«"
+
+#: json-glib/json-reader.c:463
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr ""
+"Der Typ des aktuellen Knotens ist »%s«, aber ein Array oder Objekt wurde "
+"erwartet."
+
+#: json-glib/json-reader.c:475
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr ""
+"Der Index »%d« übersteigt die Größe des Arrays an der aktuellen Position."
+
+#: json-glib/json-reader.c:492
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr ""
+"Der Index »%d« übersteigt die Größe des Objekts an der aktuellen Position."
+
+#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
+#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
+#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
+#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
+#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+msgid "No node available at the current position"
+msgstr "An der aktuellen Position ist kein Knoten verfügbar"
+
+#: json-glib/json-reader.c:583
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "An der aktuellen Position befindet sich ein »%s« und kein Array"
+
+#: json-glib/json-reader.c:646
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "Der aktuelle Knoten hat den Typ »%s«, aber ein Objekt wurde erwartet."
+
+#: json-glib/json-reader.c:653
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr ""
+"Das Mitglied »%s« ist im Objekt an der aktuellen Position nicht definiert."
+
+#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "An der aktuellen Position befindet sich ein »%s« und kein Objekt"
+
+#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
+#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
+#: json-glib/json-reader.c:1000
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr ""
+"An der aktuellen Position befindet sich ein »%s«, welches kein Wert ist"
+
+#: json-glib/json-reader.c:873
+msgid "The current position does not hold an integer type"
+msgstr "An der aktuellen Position befindet sich kein Ganzzahl-Typ"
+
+#: json-glib/json-reader.c:918
+msgid "The current position does not hold a floating point type"
+msgstr "An der aktuellen Position befindet sich kein Gleitkomma-Typ"
+
+#: json-glib/json-reader.c:963
+msgid "The current position does not hold a string type"
+msgstr "An der aktuellen Position befindet sich kein Zeichenketten-Typ"
+
+#: json-glib/json-reader.c:1008
+msgid "The current position does not hold a boolean type"
+msgstr "An der aktuellen Position befindet sich kein boolescher Typ"
diff --git a/po/el.gmo b/po/el.gmo
new file mode 100644
index 0000000000000000000000000000000000000000..aaa70906ac9878a09e098d01150bb75b8430932f
GIT binary patch
literal 5379
zcmcJRTWlOx8OIM$Zl>HqAy96oQjC)(>#XfwqBW+4CM{{}#3XKrgapj)9M_fKn
zfbYS92kzu|uS=<)g0Fy+;DaA?aa;y>aQ_!@5PT1mI0o-`@dw~{xPJre1>Xgq1$TU0
zsR|f@Mextyb70{UN`>Hga2$LW`~~>^Pb&2z@Sotf!IPg-%7DKEkAq+Pv{KK5KL)=G
z-Uh!1?tpArcN+W&_;>IU7=On3>3YENF#$^azXwU%)(%jVOW{(Hw)!#`?(9cu{Y9>i
za*?uveuX3yZq;@!=vJhpKFcK^XzciiCPZt{Vf8?n)fc!(R}n({Bbt*BXUvt&Lgjs1`|38jjoz%(ZuS2UG0aJ&h>kAv7YL5+~_!pQXNKRqy0ojV>+Fv
z8U4fVq(`+wC?27d`00Nyo#NEo~HQ
zzPD89!LL=EDfe#O(j9lV2+-xoBvypuQBWq^ViW}i|DxIse;e)?3nI@7q!#&5yY-EU
z6WW$Hgb+}#$(y4~aYv!}a^xD#E8jVE$Q
z$AwwskoYedI~(}!s=k3hUCr;pTC?(-nsbxPaYS@7g6yzxikJBAWaWjhB}&wp#-3ik
zJ=LmpQnRMZW(P|zsF665ahp3>&K)zcjEjPPF^R%lCGd;7>Lu{jb;QVg%nc_MznuG4
zy^`ccqk|m^)%l_!8Edb^U$1f1ofhusc7%
zy61^AHyV3k5_qY+a`yXGA9*MGXpNZ{C3C&vk?S}=}?;1Whd|-va
zzTSM-QxPnLgaz@k^;EjI7I=O*sAWF!h8TKb^y%Ebm30#Sn2B=-!ctTw>Vn=^^wX}9
zpdNcc?rCOhQqW<|-X=r+gW7!^+8OGHhIHSq!LH-EXG~~fN5L^aPCYNs`QFEg=6J4E
z>7(gHKtMK)uGae+GR|jLvPBr0)!A%zOKuwH8dE}*eS>G0vjur}Gn;Lk<+{*#6(Sd8
zg=XJ;_FJCcgvyKU*OZ3fd0B+jtC*b67PS51Twq3a%u|FV{@==$-J3=3B!-)I>s$Dt
zShAmOVrWt7rLx!LmzHG-Nvsq324?rj!$tnCXdGdDn!Rs{DNUX>P;#0?AX8W%Cy7fu
zENJeR8|Q$=MHb3edz{EF2^$!+9JF7a_E?c!myDd{WoHrF*Rr=E#D=P}^TcqDA8#~Q
zWpmujQiho}fh&t7OguZnmm1S@D=w~KM547)mS`ytT`p&lwu5!{645!Bnzme?+scNs
zI71ta3%2A-#By=%HlmP<(qr1%xAa;MQ*2%!_$v}N)fEbCA1)L3j8uRXtFnGmN-gPK
z&z4#5YHv>+Hf2{8D;;#IvR~S~h2{&k$3>tbOt+I#UWKLemR(URPdCivb#WkSXqH_v
zxriZzBAK{?OEObdwc<(Wl|vLOxsjqbbs|NP##o@2u9NVYRT;MYAST)2wk{CAlyuhd
z(NR;E{T#;RDZ7@)=w$>d%Z1Z5-c=F9O(?%E+p>4EtAs5DTCIQQ{DzBrk|h^J
z;Vi_g+i^o>mywF}rz?e++(Q2l|AMXZRUs5|Y%fWr3Bk^i&bmm7a?qoocWh1(x~&LI
zydz>13M52{ZMJc`F|A?UHQ2Hyr&%e#ZI&7NhIUJ|$giYW&7@(VBP&~qjRt@_H)63l
zQLIGqy}D)+%1nE5tv{KtATDh1bhU8Aob0{Vk!>^>H*|k#6)|hn;5rl0+L=iqMKZ2m
z+Fsek6v6mwOSnIOMly8_1_tW
z)SHkZdRw4pTH|1IWB+I
zad*7-MeS6z{WhaWKS0M$g$Z7CayPIIok72QyA`;LBbt}3zsOAtV{RSXn0Kq6I!@pD>g49
rl$LKyBEl&sw)4E{hj!Wg#nn8lby#yXaudTA9Gy$=ts27iIH>*&8O_Ep

literal 0
HcmV?d00001

diff --git a/po/el.po b/po/el.po
new file mode 100644
index 0000000..29b10e1
--- /dev/null
+++ b/po/el.po
@@ -0,0 +1,179 @@
+# Greek translation for json-glib.
+# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
+# This file is distributed under the same license as the json-glib package.
+# Dimitris Spingos , 2012.
+# Dimitris Spingos (Δημήτρης Σπίγγος) , 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: json-glib master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
+"glib\n"
+"POT-Creation-Date: 2012-06-30 15:20+0100\n"
+"PO-Revision-Date: 2012-06-21 23:33+0300\n"
+"Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) \n"
+"Language-Team: team@gnome.gr\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.0\n"
+"X-Project-Style: gnome\n"
+
+#: json-glib/json-gobject.c:934
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr ""
+"Αναμένεται αντικείμενο JSON, αλλά ο κόμβος υπερχρήστη είναι του τύπου `%s'"
+
+#: json-glib/json-gvariant.c:539
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Αναπάντεχος τύπος '%s' σε κόμβο JSON"
+
+#: json-glib/json-gvariant.c:609
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "Λείπουν στοιχεία σε πίνακα JSON για συμφωνία με πλειάδα"
+
+#: json-glib/json-gvariant.c:637
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Λείπει το σύμβολο κλεισίματος ')' στον τύπο πλειάδας GVariant"
+
+#: json-glib/json-gvariant.c:645
+msgid "Unexpected extra elements in JSON array"
+msgstr "Αναπάντεχα πρόσθετα στοιχεία σε πίνακα JSON"
+
+#: json-glib/json-gvariant.c:924
+msgid "Invalid string value converting to GVariant"
+msgstr "Άκυρη τιμή συμβολοσειράς μετατροπής σε GVariant"
+
+#: json-glib/json-gvariant.c:980
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+"Μια καταχώριση λεξικού GVariant περιμένει ένα αντικείμενο JSON με ακριβώς "
+"ένα μέλος"
+
+#: json-glib/json-gvariant.c:1236
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "Η κλάση GVariant '%c' δεν υποστηρίζεται"
+
+#: json-glib/json-gvariant.c:1281
+msgid "Invalid GVariant signature"
+msgstr "Άκυρη υπογραφή GVariant"
+
+#: json-glib/json-gvariant.c:1326
+msgid "JSON data is empty"
+msgstr "Τα δεδομένα JSON είναι κενά"
+
+#: json-glib/json-parser.c:818
+#, c-format
+msgid "%s:%d: Parse error: %s"
+msgstr "%s:%d: Σφάλμα ανάλυσης: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "Μόνο ένας κόμβος υπερχρήστη επιτρέπεται σε μια έκφραση JSONPath"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "Κόμβος υπερχρήστη ακολουθούμενος από άκυρο χαρακτήρα '%c'"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Κακοσχηματισμένη έκφραση τεμαχισμού '%*s'"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Άκυρος ορισμός συνόλου '%*s'"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Άκυρος ορισμός τεμαχισμού '%*s'"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Άκυρος ορισμός δείκτη πίνακα '%*s'"
+
+#: json-glib/json-reader.c:463
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr ""
+"Ο τρέχον κόμβος είναι του τύπου '%s', αλλά ένας πίνακας ή ένα αντικείμενο "
+"αναμενότανε."
+
+#: json-glib/json-reader.c:475
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr ""
+"Ο δείκτης '%d' είναι μεγαλύτερος από το μέγεθος του πίνακα στην τρέχουσα "
+"θέση."
+
+#: json-glib/json-reader.c:492
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr ""
+"Ο δείκτης '%d' είναι μεγαλύτερος από το μέγεθος του αντικειμένου στην "
+"τρέχουσα θέση."
+
+#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
+#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
+#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
+#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
+#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+msgid "No node available at the current position"
+msgstr "Χωρίς διαθέσιμο κόμβο στην τρέχουσα θέση"
+
+#: json-glib/json-reader.c:583
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "Η τρέχουσα θέση περιέχει ένα '%s' και όχι ένα πίνακα"
+
+#: json-glib/json-reader.c:646
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr ""
+"Ο τρέχον κόμβος είναι του τύπου '%s', αλλά ένα αντικείμενο αναμενότανε."
+
+#: json-glib/json-reader.c:653
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "Το μέλος '%s' δεν ορίζεται στο αντικείμενο στην τρέχουσα θέση."
+
+#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "Η τρέχουσα θέση περιέχει ένα '%s' και όχι ένα αντικείμενο"
+
+#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
+#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
+#: json-glib/json-reader.c:1000
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "Η τρέχουσα θέση περιέχει ένα '%s' και όχι μια τιμή"
+
+#: json-glib/json-reader.c:873
+msgid "The current position does not hold an integer type"
+msgstr "Η τρέχουσα θέση δεν περιέχει ακέραιο τύπο"
+
+#: json-glib/json-reader.c:918
+msgid "The current position does not hold a floating point type"
+msgstr "Η τρέχουσα θέση δεν περιέχει τύπο κινητής υποδιαστολής"
+
+#: json-glib/json-reader.c:963
+msgid "The current position does not hold a string type"
+msgstr "Η τρέχουσα θέση δεν περιέχει τύπο συμβολοσειράς"
+
+#: json-glib/json-reader.c:1008
+msgid "The current position does not hold a boolean type"
+msgstr "Η τρέχουσα θέση δεν περιέχει τύπο Μπουλ"
diff --git a/po/es.gmo b/po/es.gmo
new file mode 100644
index 0000000000000000000000000000000000000000..1f709492dc4939a50d0ff973243cdbd54e93a331
GIT binary patch
literal 4198
zcmbtXOK?<06m9WK{3D8gn$oGr=S?Q@hl2qWf}jLa5ZGDR^Im7tR8RM_yC)hJR;epp
zxO2sdwUtteDi`9yVm4TX3-*@f-i15eS)SYdW+uTTKsi+}XWqQqeeXT@^t~^?ZMy4g
zhR;@9&*IvA2V>iT4{X36e7*xd0lWx20=x=r0yo{s*f!ua@M)k0z6kshNc(&Xd>(iW
zxD)sXa1(ILU5s(y4&bZ6_kgbeKLwKC?}4uYe+TXYZn-=8JqVn{{a3(o;5FcG;6K0y
z@b!Bbn*h!O>G}EU{ukiOxM%kwR=_L3W5CaVQ^4!MQQ(&QQa<~DKZ64Sq&#+xFm?iX
z7`PvJ9#{kZ3Z&;7?oaz~1@6H8NnjoL36SDh0zMA>z54wx;2XHFJ;2x=;29wCa2`m%
zUk4H&_dl5O-Vda_zXa00SAk^zH*gG?J(T!;A4vYbsPIQ1<^3n{DDZ`c89NRvfro)V
z0m;wCM^gTKfk->%1Yjr^g9$^L>^WR`96wa+XK-!Ag;W^mXOIMY6xSA9pqnAIm@|NZ
z#uXpZ1ZfRvMm?a+>?vFblWoS;|B&YBgYvM);y1>gB&_*nt!VNY;k@M1IqRCd=Gj~P
zozuc8VFE8y9+Wl0EpllB{r$LDR3U<(9A&2ri)>oxIqN#I;6CmTR-N>I7~8bM9rnq!jp!FUEvxzH
z_EBULnH%sEx}}zpIM!b!wd|l=o@}G{!~=pth~${!6FjbD$80KqSP)8!7WNXUHhI@M
z?7~ZgK(w*rrmF6WstK*_N5}-ek|<_G6hl8Fc4AQDIa}Gbs3@s=`Mhw@jdZcZY!;&E
zJHAmDqtHc?j)1RNTI)Ez_f;ssZ&aKt>bJhrO;`5`;Dwbwig4cQ0@=2#)e`%6%e=QZ6^iEAu#4iS>g!MQ45OAA}OBY
zyV)+MOkb2xXK;eAemvPSJE~dbvO2+Z7TAol)NZpQMRr;`Y8Op@)?1UcwQBK>@ZfFa
zgrxqMP5ZVgvbVc!pUv7PpAVsIj*Ydt?Q=?NQEwaDk#+0ZV>sf{oxy{8-d6icXNztg
zCI{P&%p9N14p2?tE<1?QH2Fkhd?IVSmc88Icly8VZ+Fm~>bdRg9XTpYyDQohi9I}hoqWmg
zZIgU_`<{{hYA)JF$jAV=Z!C*l)rG%WisR5#;
z$6k*X&wcNbw)CK*Fo>OHCo$inb?Zj^T^yTOXp*LYteWr35aIgQ;&kG*?gp(Yqb&O2c&;&MT;7
zhiIkgcMn7YL+n$L7h{5V(Vy|cK>*c0H00;;CS;)2-VX-Jf|Nq}(i%k*Ke?o-mCA#G
z+!dOgj50#qA(4&>k`%REB_?`EFE5b*3WCNz{0+3^WxK1$U0j|E*SiqMeWj%#?`*2l
zVDkQ75mr*Ach&!DIm$h8QU6~%)!9)I-+3UOYoB7aMJ`Am=uUXG1qbn9RKwp6%}Lm6
zS(DH#&IVopP{bgItJZZg(C5&8Juk7BFN4pAUf2~A(w%)S664OvO1V^o#rdr&LI(D(z*=4iC
PZoAx+Job+r9WVATzH26h

literal 0
HcmV?d00001

diff --git a/po/es.po b/po/es.po
new file mode 100644
index 0000000..b809632
--- /dev/null
+++ b/po/es.po
@@ -0,0 +1,173 @@
+# Spanish translation for json-glib.
+# Copyright (C) 2011 json-glib's COPYRIGHT HOLDER
+# This file is distributed under the same license as the json-glib package.
+# FIRST AUTHOR , YEAR.
+# Daniel Mustieles , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: json-glib master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
+"glib\n"
+"POT-Creation-Date: 2012-06-30 15:20+0100\n"
+"PO-Revision-Date: 2011-12-06 20:20+0100\n"
+"Last-Translator: Daniel Mustieles \n"
+"Language-Team: Español \n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: json-glib/json-gobject.c:934
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "Se esperaba un objeto JSON, pero el nodo raíz es de tipo «%s»"
+
+#: json-glib/json-gvariant.c:539
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Tipo «%s» no esperado en un nodo JSON"
+
+#: json-glib/json-gvariant.c:609
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "Faltan elementos en el vector JSON para conformar una tupla"
+
+#: json-glib/json-gvariant.c:637
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Falta el símbolo de cierre «)» en la tupla de GVariant"
+
+#: json-glib/json-gvariant.c:645
+msgid "Unexpected extra elements in JSON array"
+msgstr "Elementos adicionales no esperados en el vector JSON"
+
+#: json-glib/json-gvariant.c:924
+msgid "Invalid string value converting to GVariant"
+msgstr "Valor de cadena no válido al convertir a GVariant"
+
+#: json-glib/json-gvariant.c:980
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+"Una entrada del diccionario de GVariant espera un objeto JSON con sólo un "
+"miembro"
+
+#: json-glib/json-gvariant.c:1236
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "Clase «%c» de GVariant no soportada"
+
+#: json-glib/json-gvariant.c:1281
+msgid "Invalid GVariant signature"
+msgstr "Firma de GVariant no válida"
+
+#: json-glib/json-gvariant.c:1326
+msgid "JSON data is empty"
+msgstr "Datos de JSON vacíos"
+
+#: json-glib/json-parser.c:818
+#, c-format
+msgid "%s:%d: Parse error: %s"
+msgstr "%s:%d: error al analizar: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "Sólo se permite un nodo raíz en una expresión JSONPath"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "Nodo raíz seguido de un carácter «%c» no válido"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Expresión de particionado «%*s» mal formada"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Definición de conjunto no válida «%*s»"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Definición de particionado no válida «%*s»"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Definición de índice de vector no válida «%*s»"
+
+#: json-glib/json-reader.c:463
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr ""
+"El nodo actual es de tipo «%s», pero se esperaba un objeto o un vector."
+
+#: json-glib/json-reader.c:475
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr ""
+"El índice «%d» es mayor que el tamaño del vector en la posición actual."
+
+#: json-glib/json-reader.c:492
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr ""
+"El índice «%d» es mayor que el tamaño del objeto en la posición actual."
+
+#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
+#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
+#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
+#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
+#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+msgid "No node available at the current position"
+msgstr "No hay ningún nodo disponible en la posición actual"
+
+#: json-glib/json-reader.c:583
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "La posición actual tiene un «%s» y no un vector"
+
+#: json-glib/json-reader.c:646
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "El nodo actual es de tipo «%s», pero se esperaba un objeto."
+
+#: json-glib/json-reader.c:653
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "El miembro «%s» no está definido en el objeto en la posición actual."
+
+#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "La posición actual tiene un «%s» y no un objeto"
+
+#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
+#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
+#: json-glib/json-reader.c:1000
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "La posición actual tiene un «%s» y no un valor"
+
+#: json-glib/json-reader.c:873
+msgid "The current position does not hold an integer type"
+msgstr "La posición actual no tiene un tipo entero"
+
+#: json-glib/json-reader.c:918
+msgid "The current position does not hold a floating point type"
+msgstr "La posición actual no tiene un tipo de coma flotante"
+
+#: json-glib/json-reader.c:963
+msgid "The current position does not hold a string type"
+msgstr "La posición actual no tiene un tipo de cadena"
+
+#: json-glib/json-reader.c:1008
+msgid "The current position does not hold a boolean type"
+msgstr "La posición actual no tiene un tipo booleano"
diff --git a/po/gl.gmo b/po/gl.gmo
new file mode 100644
index 0000000000000000000000000000000000000000..96095b93d7b3a191ca6b5c07391d6fb883d57f7f
GIT binary patch
literal 4135
zcmbtXO>A7%6~54v78hEY0x8g+gH+=>$+O2!fG~;qOYA6sV=Hm8g){G6&%Ef(y~DkC
zOzd6R0TR0|s;<05C@LXR7e!)`*;G|psZ!Uddv=xBA;fp?eKU?7J8{&fJb!cNo_o*V
zcg~r7b@0F+6`tSX{T1HFA5dx%_{f9!gXc5glfdi1bHKj?o4|uVQ0iIWBJgRT1^y2B
zAyDr53-C9+
z0Q?qs7I^w+O1%#J2q^pi0zL;+k0}MWWA0>$bSZ2pxEKAzc6=n)5|@YZ!WD(^D^NoH
z9Pc5#2)BZ1>IuB^AdK4{;e>Dv?nOQz&FU$clb!m{U7GfG`J>e82MQfc&e}l67Me;=c9p_~tIP{$!ZLxE_PNgaIRVwsqX-e@1mmP+N;d!s&=boEY
znd`f32PfXakiMqenlPjp7sfy-LTxso^PI=`PacMK)?raez@UQ51`PO!1^TZ&Lzz
zjmwH#xQkP6^1gGpg?cbS!lsr?o!xC&LF9}zF4k|nMPV-a2BMCRSy
z+5JSFjQcy1q8`tr`kWXqKyFWMr&;I_IucpX!Iv94_6B@TS>J=8Dd+cbTb=p4UY9yq
ziV>`n78ILBV!YUQuUjseAt}Mm;FxwVPj#D|Q0ME??<6TlDiVH@bFgd1)m(EjfX@>`6)=
z=YDUVotv3FIW`=(GH8kM&%lQbPBZtC>3|p*v0O0vj0|4H5mVTb9*q*>HaqP1rR7}(
z6Krbl=<4JLH{^SvtF!7g5gcr`7=wL>^ik?*7!bR@CC7tn8#MR?q^3~zEZzKc+~52{
zoyOGFvdC|KA$y~7W1x$RE+#_3YN2#pn7dC%<4=Ws(CrMVMJzd4S9{jl-9&{
zhhj2R3yZ45qIkz4xOTN~;OIVNdyL^5!-fFvCV!bLXoV>`7n*MqiTQvk8Q*9C#y*KWs3thn{UyTswkttVm`p5~>!s!uYpH(lwdmNUuf~ax{;dpH3pc
zCJp0lp-hL&uv@?iV~2r@#y~3%2Rb{X84Qw<&KT*2I$V+gO9y{5I2ak#vxDn{Yb{-g
zJ{eIdHJHAAuGB>k2q_0Skle_ccq|db#M{%)l<2isAcG#daCZ{&sNhmGfpIyz!Dbxm
zHHWtHVbxNyC@H>^d^JNO+3)1A?F*w5gQotktETWvcV`$PDbN>0N34f>#-pU}Ei25j
zC*hJ;Ye*<6!s_Cv*
n%%>mGs5`EkaUB2Xez6G`cNC;r+3KHB;ZTrJJ@^7TrE1jo*d-S5

literal 0
HcmV?d00001

diff --git a/po/gl.po b/po/gl.po
new file mode 100644
index 0000000..ec8fd16
--- /dev/null
+++ b/po/gl.po
@@ -0,0 +1,169 @@
+# Galician translation for json-glib.
+# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
+# This file is distributed under the same license as the json-glib package.
+# FIRST AUTHOR , YEAR.
+# Fran Dieguez , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: json-glib master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
+"glib\n"
+"POT-Creation-Date: 2012-06-30 15:20+0100\n"
+"PO-Revision-Date: 2012-03-24 18:03+0100\n"
+"Last-Translator: Fran Dieguez \n"
+"Language-Team: Galician \n"
+"Language: gl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+
+#: json-glib/json-gobject.c:934
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "Agardábase un obxecto JSON, pero o nodo raíz é de tipo «%s»"
+
+#: json-glib/json-gvariant.c:539
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Tipo «%s» non agardado nun nodo JSON"
+
+#: json-glib/json-gvariant.c:609
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "Faltan elementos no vector JSON para conformar unha tupla"
+
+#: json-glib/json-gvariant.c:637
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Falta o símbolo de peche «)» na tupla de GVariant"
+
+#: json-glib/json-gvariant.c:645
+msgid "Unexpected extra elements in JSON array"
+msgstr "Elementos adicionais non agardados no vector JSON"
+
+#: json-glib/json-gvariant.c:924
+msgid "Invalid string value converting to GVariant"
+msgstr "Valor de cadea non válido ao converter a GVariant"
+
+#: json-glib/json-gvariant.c:980
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+"Unha entrada do dicionario e GVariant agarda un obxecto JSON con só un membro"
+
+#: json-glib/json-gvariant.c:1236
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "Clase «%c» de GVariant non admitida"
+
+#: json-glib/json-gvariant.c:1281
+msgid "Invalid GVariant signature"
+msgstr "Firma de GVariant non válida"
+
+#: json-glib/json-gvariant.c:1326
+msgid "JSON data is empty"
+msgstr "Datos de JSON baleiros"
+
+#: json-glib/json-parser.c:818
+#, c-format
+msgid "%s:%d: Parse error: %s"
+msgstr "%s:%d: erro ao analizar: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "Só se permite un nodo raíz nunha expresión JSONPath"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "Nodo raíz seguido dun carácter «%c» non válido"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Expresión de particionado «%*s» mal formada"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Definición de conxunto non válida «%*s»"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Definición de particionado non válida «%*s»"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Definición de índice de vector non válida «%*s»"
+
+#: json-glib/json-reader.c:463
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "O nodo actual é de tipo «%s», pero agardábase un obxecto ou un vector."
+
+#: json-glib/json-reader.c:475
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "O índice «%d» é maior que o tamaño do vector na posición actual."
+
+#: json-glib/json-reader.c:492
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "O índice «%d» é maior que o tamaño do obxecto na posición actual."
+
+#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
+#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
+#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
+#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
+#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+msgid "No node available at the current position"
+msgstr "Non hai ningún nodo dipoñíbel na posición actual"
+
+#: json-glib/json-reader.c:583
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "A posición actual ten un «%s» e non un vector"
+
+#: json-glib/json-reader.c:646
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "O nodo actual é de tipo «%s», pero agardábase un obxecto."
+
+#: json-glib/json-reader.c:653
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "O membro «%s» non está definido no obxecto na posición actual."
+
+#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "A posición actual ten un «%s» e non un obxecto"
+
+#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
+#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
+#: json-glib/json-reader.c:1000
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "A posición actual ten un «%s» e non un valor"
+
+#: json-glib/json-reader.c:873
+msgid "The current position does not hold an integer type"
+msgstr "A posición actual non ten un tipo enteiro"
+
+#: json-glib/json-reader.c:918
+msgid "The current position does not hold a floating point type"
+msgstr "A posición actual non ten un tipo de coma flotante"
+
+#: json-glib/json-reader.c:963
+msgid "The current position does not hold a string type"
+msgstr "A posición actual non ten un tipo de cadea"
+
+#: json-glib/json-reader.c:1008
+msgid "The current position does not hold a boolean type"
+msgstr "A posición actual non ten un tipo booleano"
diff --git a/po/id.gmo b/po/id.gmo
new file mode 100644
index 0000000000000000000000000000000000000000..60f0d2faa0870736cdf2d4a33ee83c4621df6f48
GIT binary patch
literal 4069
zcmb7GOK%)S5N;q4FyR#f;Z1{LS&1{7we#M*FpddMV#kV2#0`3P+OwURogQ`fB-z|R
zhyw>W!3Bw*z~cfEe*mO}0}^M1gg7Do00+cZ-7~wk6Fc@ubwaz6CxD{0=w^{2AB+?tFl;*MM`t7l0bL2lxq)_W1_*3h*{?
z9QZeICvf*R#yD^v@G$TK@DT6=AldyMcm((da6fSOgTd}u;3<563Y-Am1|9?c2W$e5
zKE&80unVO1FRSlgfCur-w!>GzA>cglL*NYXSKt_M_roEcGr+&VfdD>_-_MOOb`dCm
zT
z0UN+uz|+8gfyDRm#{xeNNW6Uo90&de^zl6&csNv{tndrq8OZ%q;r1sOJBjaeK;r8o
zUbpqs%Z_6%NnK;x>1
zxFOyUmahk-+4Btd*e<;FLp4Va(!-wi|1tI);izqm#x1@ejFns(qfLvCS~kVcT@gl!
z-0@g-oYJ{4eJ*oHe{U4B<182a{Nkl~uG?4f$*(Kd#ggc_tj~2Wc~AD*(y$pXt@32G
z{C?gp9d}*Hjnh`
zp|e&cxp1YCgC${%=yR3F@&=FPvdR@jgU$BALalEl;#_wzQysa%vNIGN94RI5==_>A
zj(%`@;1=^l#li`SQT7VgXLBN3)}|+8ZvFmX)ktfHzRf9oVV_Q>J=%V+tusEhcMQ>Z
z<_7$@vdE+-j@4Q+lRc!%lB~BLcz{!Ikqnc6f_qIiuR{XFHK8)m#$F=irc)Y&U3dW(
zh&Fa9ud=%;Ya+|^bwmPNp(qxFFNQiIc6pHFWnIa(DJda)ovtvb8)^lb%4Btd=`64Xqp96SvvG7q8fq6Ue%0zcN;1{vJz>Gy$Yn|W
zF`Bc9ilaBn#70ZH#kF~*F=jN&JKC~v5V!#Tw>6m4-8kIc=^%?!z!Xf#KrH3H7z0XS}Phm;&BGNJMl
zoLUiv!Kuek3{_Lgs
znZ?HYM06iF_h}#I|2lHZy@#Y7y;;HDBb}(eT9Cgwnt@>da
zI)4m(I!Cg=W|q`JWTKs5b6B~H#(wTZp{kLP3d1qSovO-_U67c@zEclPJCWj^5SMA0
zCu|9+!(@RGSRKwNi1>ET&iX-X71~oQQ_C}4G*WDcfefuXq-Zv;zvyS@+U0pnF~#eC
zS#OEhD>nU*h6AY__{UJz)rBV2I8OdBX?yACb}@>!?el|=R)Qs
zMyemuF+?$CiMKGHYbsXig+9Q8Y#_o550%bd$>^$TsY)qC28K)DD%0ABy7(F!t5+V^(i~w@8mQ~04Yn{0
z*wX>dM6W<4;-W~^?o&W>dXtiMPI1c>7(koT3dOcL*>-KAUE+MN(i!^hCvuGZv`flT
z2qmY&-im@Jek%%|Q{0RF$@KF$lWj#MZ&5lij;b#*oOJZW>gcX5yT+#Vy|p{aw!x-C
ug9`JnYA#jR7?$jM$}|4z%TduZX?^X4Ee7?o_PDX7y1Q*4?hg>14)#ASUdT!S

literal 0
HcmV?d00001

diff --git a/po/id.po b/po/id.po
new file mode 100644
index 0000000..46145b0
--- /dev/null
+++ b/po/id.po
@@ -0,0 +1,170 @@
+# Indonesian translation for json-glib.
+# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
+# This file is distributed under the same license as the json-glib package.
+# Andika Triwidada , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: json-glib master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
+"glib\n"
+"POT-Creation-Date: 2012-06-30 15:20+0100\n"
+"PO-Revision-Date: 2012-05-19 12:42+0700\n"
+"Last-Translator: Andika Triwidada \n"
+"Language-Team: Indonesian \n"
+"Language: id\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Indonesian\n"
+"X-Poedit-Country: INDONESIA\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: json-glib/json-gobject.c:934
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "Mengharapkan objek JSON, tapi node akar bertipe '%s'"
+
+#: json-glib/json-gvariant.c:539
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Tipe '%s' yang tak diharapkan dalam node JSON"
+
+#: json-glib/json-gvariant.c:609
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "Kehilangan elemen dalam larik JSON untuk memenuhi syarat sebagai tuple"
+
+#: json-glib/json-gvariant.c:637
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Kehilangan simbol penutup ')' dalam tipe tuple GVariant"
+
+#: json-glib/json-gvariant.c:645
+msgid "Unexpected extra elements in JSON array"
+msgstr "Elemen ekstra yang tak diharapkan dalam larik JSON"
+
+#: json-glib/json-gvariant.c:924
+msgid "Invalid string value converting to GVariant"
+msgstr "Nilai string tak valid saat mengonversi ke GVariant"
+
+#: json-glib/json-gvariant.c:980
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+"Suatu entri kamus GVariant mengharapkan objek JSON dengan tepat satu anggota"
+
+#: json-glib/json-gvariant.c:1236
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "Kelas '%c' GVariant tak didukung"
+
+#: json-glib/json-gvariant.c:1281
+msgid "Invalid GVariant signature"
+msgstr "Tanda tangan GVariant tak valid"
+
+#: json-glib/json-gvariant.c:1326
+msgid "JSON data is empty"
+msgstr "Data JSON kosong"
+
+#: json-glib/json-parser.c:818
+#, c-format
+msgid "%s:%d: Parse error: %s"
+msgstr "%s:%d: Galat mengurai: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "Hanya satu node akar yang diijinkan dalam ekspresi JSONPath"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "Node akar diikuti oleh karakter tak valid '%c'"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Ekspresi slice '%*s' salah bentuk"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Definisi set '%*s' tak valid"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Definisi slice '%*s' tak valid"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Definisi indeks larik '%*s' tak valid"
+
+#: json-glib/json-reader.c:463
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "Node kini bertipe '%s', tapi larik atau objek yang diharapkan."
+
+#: json-glib/json-reader.c:475
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "Indeks '%d' lebih besar daripada ukuran larik pada posisi kini."
+
+#: json-glib/json-reader.c:492
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "Indeks '%d' lebih besar daripada ukuran objek pada posisi kini."
+
+#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
+#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
+#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
+#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
+#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+msgid "No node available at the current position"
+msgstr "Node tak tersedia pada posisi kini"
+
+#: json-glib/json-reader.c:583
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "Posisi kini menampung '%s' dan bukan suatu larik"
+
+#: json-glib/json-reader.c:646
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "Node kini bertipe '%s', tapi yang diharapkan adalah objek."
+
+#: json-glib/json-reader.c:653
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "Anggota '%s' tak didefinisikan dalam objek pada posisi kini."
+
+#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "Posisi kini menampung '%s' dan bukan suatu objek"
+
+#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
+#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
+#: json-glib/json-reader.c:1000
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "Posisi kini menampung '%s' dan bukan suatu nilai"
+
+#: json-glib/json-reader.c:873
+msgid "The current position does not hold an integer type"
+msgstr "Posisi kini tak menampung suatu tipe bilangan bulat"
+
+#: json-glib/json-reader.c:918
+msgid "The current position does not hold a floating point type"
+msgstr "Posisi kini tak menampung suatu tipe bilangan pecahan"
+
+#: json-glib/json-reader.c:963
+msgid "The current position does not hold a string type"
+msgstr "Posisi kini tak menampung suatu tipe string"
+
+#: json-glib/json-reader.c:1008
+msgid "The current position does not hold a boolean type"
+msgstr "Posisi kini tak menampung suatu tipe bool"
diff --git a/po/it.gmo b/po/it.gmo
new file mode 100644
index 0000000000000000000000000000000000000000..dd7de70d396a2ed41855c3e64dfa4278e0a1de5e
GIT binary patch
literal 4136
zcmbVOO>h)N6mAtoBmN;8f1yEBE0Ec2!mkSvkR((z2{8n2miEqcCQZ#wPj&YM!oe!N
zU|FR%PF_5Ev6O?}yognLz=Ky0mM1-M_Ta_xd)>3U2_%F##qjN9x?jKdz3;s@zi;1i
zjp5pb`z72v?qh5(aNGU(57#%qXMxv&lfa*WP2lzi7~2h;2EG8)z*m8v0LjkRz@5OG
z!2Q5m!0o{PEsSyCKHwqX+rWds4}o;6{tIjX
zk37WK2yhWd??11ee*qrAGusMZ0SAFIz>k3Az+ZtiVE@A*o)f@t!GQo$9Q}Qa%>fSr
zDekMlSAahNp9lU4BtO}s;qMV}0FUngDZWcU;_oZq9^j9_Bf!6a6wj`0j12+b1-=ga
z6iEL61Uv)$2Y4KK>ah^t2S8ePy?VX{r1d)=54_C+>D;S8I_G=f4DfH@EO6`z+`wzV
zLEvvd4&3@AV+h;F3}8qX!z+gH*vq)_+Fz9G7jZv=8zC^z&mal*6z+c9pqs%Z_6%;i
zK;x>5G(lQJSY8iEv*!`+u^qTO7jZ@x(!-wizZiRtaKJVPk|v)O#!4=Y(Wc1?{}jt#fB*xNcpcAFwsnbs^4#wY)YE*RarWTNZ^jP9|(J
zUlN&0dd^yv=E9Xmc3%l=ZTA}{kqE~s2lG%&UgCv^5(i8$ANnWu9ULho
zk9EEzjiWy}-F1t3q7vZ*#VFf_TV~TDThOL06K=hIuxg~WJ>RAko?s`=v`4$#Zt0BI
z_SO)MXRgbSD~n8e;#g;w%w!wsvb5Hp9(aILaFGrs{{;6t*^CYe5KBU3q6J$b4^tRRY6;l$d^3+H{a&U{pEaYI-73q5eeuu2DBhZlZO<1cke^+y%lLe089kn3eEP~?6
zzm2S%&pV=oI-L=G?eb(R)=|!?BdZFgT41wAQ@f2Oljwpp)GnI*qSbknW~#;8!h*NH
zIZ6F7nzpG*qBqObM)SJK7o97bLqn}Hy`r*A)YDwIWnG(e2qiAfdw5ZgQ+1*+Iw@l}
z+BMrZdv-oLO*z4F(HK(GBK_O~KD--iX|0!qLc?Dr3PXFn^?TiXYDw!q1akAK$>9JS{~kqj@RXO+M++
z`5}+vt~i+~>ufz!d3m|6TyJTUE7vzYIX&LvYPjC$JFO9K4hKMSlRIQ&sK|uMk8$cm
zm<6Nf=O?10y>;X$Jc`EiSSRSoO@6cm%d=T&L>5h;o7yJN3;$?GM~?CEbM&=*_vrB6
zV||?|>*p&*i9)Htd#n7cJ)fiCG>sUAe^5F4&kKq7;J<2Zcz7gp&0m*PB{6&MBJ3+7Dx7
z4f!c8s=6)m7@tg%jtrF2eC;vC#=}%rot4TvR}1|3Fn%^sATK`{ms-mc~
zskLbEu7U@rBvKC+yw+O-5wIf;?4ROmuJ`fu!3x%-h
zZ9Ws5-c|9=rfOB4`}vK0w?&#NUy#1^5{3R0Di89=D!H$tT4ZsP<~lubU4t{|PrlFj
uuYXM~F!V_;%us?G8tIlU#a2R1OA6mtUd(q?F`MtS)6Np#g+gKY0{ai%;po=@

literal 0
HcmV?d00001

diff --git a/po/it.po b/po/it.po
new file mode 100644
index 0000000..06b800d
--- /dev/null
+++ b/po/it.po
@@ -0,0 +1,173 @@
+# Italian translation for json-glib.
+# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
+# This file is distributed under the same license as the json-glib package.
+# Luca Ferretti , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: json-glib master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
+"glib\n"
+"POT-Creation-Date: 2012-06-30 15:20+0100\n"
+"PO-Revision-Date: 2012-05-13 12:27+0200\n"
+"Last-Translator: Luca Ferretti \n"
+"Language-Team: Italian \n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+
+#: json-glib/json-gobject.c:934
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "Atteso un oggetto JSON, ma il nodo radice è del tipo \"%s\""
+
+#: json-glib/json-gvariant.c:539
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Tipo \"%s\" inatteso nel nodo JSON"
+
+#: json-glib/json-gvariant.c:609
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "Elementi mancanti nell'array JSON per conformità a una tupla"
+
+#: json-glib/json-gvariant.c:637
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Simbolo ')' di chiusra mancante nel tipo tupla GVariant"
+
+#: json-glib/json-gvariant.c:645
+msgid "Unexpected extra elements in JSON array"
+msgstr "Elementi aggiuntivi inattesi nell'array JSON"
+
+#: json-glib/json-gvariant.c:924
+msgid "Invalid string value converting to GVariant"
+msgstr "Valore di stringa non valido nella conversione a JSON"
+
+#: json-glib/json-gvariant.c:980
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+"Una voce di dizionario GVariant richiese un oggetto JSON con esattamente un "
+"membro"
+
+#: json-glib/json-gvariant.c:1236
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "Classe GVariant '%c' non supportata"
+
+#: json-glib/json-gvariant.c:1281
+msgid "Invalid GVariant signature"
+msgstr "Firma GVariant non valida"
+
+#: json-glib/json-gvariant.c:1326
+msgid "JSON data is empty"
+msgstr "I dati JSON sono vuoti"
+
+#: json-glib/json-parser.c:818
+#, c-format
+msgid "%s:%d: Parse error: %s"
+msgstr "%s:%d: errore di analisi: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "È consentito un solo nodo radice in una espressione JSON"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "Nodo radice seguito dal carattere non valido '%c'"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Espressione slice '%*s' malformata"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Definizione di set '%*s' non valida"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Definizione di slice '%*s' non valida"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Definizione di indice array '%*s' non valida"
+
+#: json-glib/json-reader.c:463
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr ""
+"Il tipo del nodo corrente è \"%s\", ma era atteso un array o un oggetto."
+
+#: json-glib/json-reader.c:475
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr ""
+"L'indice '%d' è maggiore della dimensione dell'array alla posizione corrente."
+
+#: json-glib/json-reader.c:492
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr ""
+"L'indice '%d' è maggiore della dimensione dell'oggetto alla posizione "
+"corrente."
+
+#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
+#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
+#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
+#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
+#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+msgid "No node available at the current position"
+msgstr "Nessun nodo disponibile alla posizione corrente"
+
+#: json-glib/json-reader.c:583
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "La posizione corrente contiene un \"%s\" e non un array"
+
+#: json-glib/json-reader.c:646
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "Il tipo del nodo corrente è \"%s\", ma era atteso un oggetto."
+
+#: json-glib/json-reader.c:653
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "Non è definito il membro \"%s\" nell'oggetto alla posizione corrente."
+
+#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "La posizione corrente contiene un \"%s\" e non un oggetto"
+
+#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
+#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
+#: json-glib/json-reader.c:1000
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "La posizione corrente contiene un \"%s\" e non un valore"
+
+#: json-glib/json-reader.c:873
+msgid "The current position does not hold an integer type"
+msgstr "La posizione corrente non contiene un tipo intero"
+
+#: json-glib/json-reader.c:918
+msgid "The current position does not hold a floating point type"
+msgstr "La posizione corrente non contiene un tipo floating point"
+
+#: json-glib/json-reader.c:963
+msgid "The current position does not hold a string type"
+msgstr "La posizione corrente non contiene un tipo stringa"
+
+#: json-glib/json-reader.c:1008
+msgid "The current position does not hold a boolean type"
+msgstr "La posizione corrente non contiene un tipo bpplean"
diff --git a/po/json-glib-1.0.pot b/po/json-glib-1.0.pot
index b7383ee..6315bd3 100644
--- a/po/json-glib-1.0.pot
+++ b/po/json-glib-1.0.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: json-glib 0.14.2\n"
+"Project-Id-Version: json-glib 0.15.2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2011-10-26 12:31+0100\n"
+"POT-Creation-Date: 2012-06-30 15:20+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -67,31 +67,31 @@ msgstr ""
 msgid "%s:%d: Parse error: %s"
 msgstr ""
 
-#: json-glib/json-path.c:380
+#: json-glib/json-path.c:375
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr ""
 
-#: json-glib/json-path.c:389
+#: json-glib/json-path.c:384
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr ""
 
-#: json-glib/json-path.c:495
+#: json-glib/json-path.c:490
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr ""
 
-#: json-glib/json-path.c:539
+#: json-glib/json-path.c:534
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr ""
 
-#: json-glib/json-path.c:592
+#: json-glib/json-path.c:587
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr ""
 
-#: json-glib/json-path.c:620
+#: json-glib/json-path.c:615
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr ""
diff --git a/po/nb.gmo b/po/nb.gmo
new file mode 100644
index 0000000000000000000000000000000000000000..a8601563b8877efcf15fecaef03ac34ab08f563f
GIT binary patch
literal 1538
zcmb7EJ#W-N5H%3KPNJcrKw>Bm5@;R!LZZZce*`JOkq8bb(cXFD+njIL+FhR#8h!vZ
z9YrXh;U_>t@)PJO_ythV^X$7M1qnJV%{}k!yxE!AdH#NS>TQ6h0XqxJVW(hUVAb;z
zb{h5z7Q?0v1;IRU4j2IqunF7*R{P(8Gr*&VgJ2Q306Y(T4Sa{a_rNn)-Wn8@AE|Sz~U7Dn!%*zAH*`J}wbk?}*>lO@n(7~y7
zOmwsAR?4eNbBc_}qpc%nk|=+lCWpZ@&Fclifl-w^4yCESC2dj;R;;Pc6HBRh&eq{-
z5?XUci!4_iio&=Vt~Z`=VXPM|m#I|TDKjV9CZV49MKV3zDYI89&t;ftGvLtJY#KMs
z_9ZsLZl-P))}&?EU*8SeSXpk1yOwc%IOv}AoKQ20nQq|Qp2
zv1qd#{LN7DycW81D_0K1gat+>ER_kh*`p?;JB`*-YjLl4aTqo38q}|m5L%v)=XF0_
z#DtM8`@XbP4WStXkGDSz
zw?9HrDc6#6Ymk)EnyaaTkLvfCSl6m@{n6Y`%2~}fyq9_IYJp73LWZm}@n4)C=aV0V
zYPLRIa9f|rWV`hZ*{15iZj76;57XDm>HDC?Y0iV4$UB`Ismyv(V?P=~L3*F2Lt?{f
Q+DG4?oj9r%n5YHz2T-c#2><{9

literal 0
HcmV?d00001

diff --git a/po/nb.po b/po/nb.po
new file mode 100644
index 0000000..e0d5e2c
--- /dev/null
+++ b/po/nb.po
@@ -0,0 +1,166 @@
+# Norwegian bokmål translation of json-glib.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Kjartan Maraas , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: json-glib 0.12.x\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
+"glib\n"
+"POT-Creation-Date: 2012-06-30 15:20+0100\n"
+"PO-Revision-Date: 2011-12-19 09:45+0100\n"
+"Last-Translator: Kjartan Maraas \n"
+"Language-Team: Kjartan Maraas \n"
+"Language: nb\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: json-glib/json-gobject.c:934
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr ""
+
+#: json-glib/json-gvariant.c:539
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Uventet type «%s» i JSON-node"
+
+#: json-glib/json-gvariant.c:609
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr ""
+
+#: json-glib/json-gvariant.c:637
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr ""
+
+#: json-glib/json-gvariant.c:645
+msgid "Unexpected extra elements in JSON array"
+msgstr ""
+
+#: json-glib/json-gvariant.c:924
+msgid "Invalid string value converting to GVariant"
+msgstr ""
+
+#: json-glib/json-gvariant.c:980
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+
+#: json-glib/json-gvariant.c:1236
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr ""
+
+#: json-glib/json-gvariant.c:1281
+msgid "Invalid GVariant signature"
+msgstr ""
+
+#: json-glib/json-gvariant.c:1326
+msgid "JSON data is empty"
+msgstr "JSON-datastruktur er tom"
+
+#: json-glib/json-parser.c:818
+#, c-format
+msgid "%s:%d: Parse error: %s"
+msgstr ""
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr ""
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr ""
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr ""
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr ""
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr ""
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr ""
+
+#: json-glib/json-reader.c:463
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr ""
+
+#: json-glib/json-reader.c:475
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr ""
+
+#: json-glib/json-reader.c:492
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr ""
+
+#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
+#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
+#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
+#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
+#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+msgid "No node available at the current position"
+msgstr ""
+
+#: json-glib/json-reader.c:583
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr ""
+
+#: json-glib/json-reader.c:646
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr ""
+
+#: json-glib/json-reader.c:653
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "Medlem «%s» er ikke definert i objekt ved nåværende posisjon."
+
+#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "Nåværende posisjon innholder en «%s» og ikke et objekt"
+
+#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
+#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
+#: json-glib/json-reader.c:1000
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "Nåværende posisjon inneholder en «%s» og ikke en verdi"
+
+#: json-glib/json-reader.c:873
+msgid "The current position does not hold an integer type"
+msgstr "Nåværende posisjon inneholder ikke en heltallstype"
+
+#: json-glib/json-reader.c:918
+msgid "The current position does not hold a floating point type"
+msgstr "Nåværende posisjon inneholder ikke en flyttallstype"
+
+#: json-glib/json-reader.c:963
+msgid "The current position does not hold a string type"
+msgstr "Nåværende posisjon inneholder ikke en streng-type"
+
+#: json-glib/json-reader.c:1008
+msgid "The current position does not hold a boolean type"
+msgstr "Nåværende posisjon inneholder ikke en boolsk type"
diff --git a/po/pa.gmo b/po/pa.gmo
new file mode 100644
index 0000000000000000000000000000000000000000..52a3f2e9e7f0d2c5e8e52f5d27b6a8eeaa6d747f
GIT binary patch
literal 1521
zcmb_cU5gw=6fHG=4fv7=AH;{dkYyF^nVuat3B4Ijj7eO{CPQ`-%u}eDuJrb%r@E=C
zUXnb;19QztWkk#txyy
zG?CntO0f5qPM)Bc8&0VvF)GX@b|Oc5EQqi2G~KHBO1D8^NMZ(l~g#OmxuCBU(15h+3^dnOsh@j5iaRk3=(9
zNeh(4lBW{P6Y38BO;m&+p|HqH|T`ao{MI~*TQxf
zA}}~5R@2JXj<~s?y_dp$Q3r8zov?8nK7+pEQfJ&$@AeQa(V>iw=m6)SgQZ4sO?|#8
zg?SUtL2@^LTDV1#c`aEFPKkt=$Y8hjY{}
zVFvAv$cT%kRb)Js^E6zpK0ebu-9H-apTt$B&kGeCk;6PrWfIZ;L24SktW-P;j^=8l
zBa(%m>hA13)x)l&sV=qW8}A3lgcPbS`*?lxUL?;!GCeG@Qn_D7$46}!l_)qH%#*)`_uht7WO#vi!x_dfNm4_uqv
z6lZUFg-vHa$AR^IarU~8yM|u~Vgu)GK@$^5ue+O@kiO%_pE~=M8?SkhDiT(1I=fvv
z$NXb|F3Pxy$%Y$$;_Ny`cWWu@7q0ubs(hRPm$#k$21`4t_}8QSWvseaDZuZoiP_g7
zhWxq(TmPqWtyR^Hm$D7|$h${J*8S48huxeMivDkVk6$7j@8(9;z^c19{#NllyyO1^
F*k8#eWR?H`

literal 0
HcmV?d00001

diff --git a/po/pa.po b/po/pa.po
new file mode 100644
index 0000000..6395877
--- /dev/null
+++ b/po/pa.po
@@ -0,0 +1,168 @@
+# Punjabi translation for json-glib.
+# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
+# This file is distributed under the same license as the json-glib package.
+#
+# A S Alam , 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: json-glib master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
+"glib\n"
+"POT-Creation-Date: 2012-06-30 15:20+0100\n"
+"PO-Revision-Date: 2012-05-16 07:30+0530\n"
+"Last-Translator: A S Alam \n"
+"Language-Team: Punjabi/Panjabi \n"
+"Language: pa\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 1.4\n"
+
+#: json-glib/json-gobject.c:934
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr ""
+
+#: json-glib/json-gvariant.c:539
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "JSON ਨੋਡ ਵਿੱਚ ਅਣਜਾਣ ਕਿਸਮ '%s'"
+
+#: json-glib/json-gvariant.c:609
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr ""
+
+#: json-glib/json-gvariant.c:637
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr ""
+
+#: json-glib/json-gvariant.c:645
+msgid "Unexpected extra elements in JSON array"
+msgstr ""
+
+#: json-glib/json-gvariant.c:924
+msgid "Invalid string value converting to GVariant"
+msgstr ""
+
+#: json-glib/json-gvariant.c:980
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+
+#: json-glib/json-gvariant.c:1236
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "GVariant ਕਲਾਸ '%c' ਸਹਾਇਕ ਨਹੀਂ"
+
+#: json-glib/json-gvariant.c:1281
+msgid "Invalid GVariant signature"
+msgstr "ਅਢੁੱਕਵਾਂ GVariant ਦਸਤਖਤ"
+
+#: json-glib/json-gvariant.c:1326
+msgid "JSON data is empty"
+msgstr "JSON ਡਾਟਾ ਖਾਲੀ ਹੈ।"
+
+#: json-glib/json-parser.c:818
+#, c-format
+msgid "%s:%d: Parse error: %s"
+msgstr "%s:%d: ਪਾਰਸ ਗਲਤੀ: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr ""
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr ""
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr ""
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr ""
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr ""
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr ""
+
+#: json-glib/json-reader.c:463
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr ""
+
+#: json-glib/json-reader.c:475
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr ""
+
+#: json-glib/json-reader.c:492
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr ""
+
+#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
+#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
+#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
+#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
+#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+msgid "No node available at the current position"
+msgstr "ਮੌਜੂਦਾ ਸਥਿਤੀ ਉੱਤੇ ਕੋਈ ਵੀ ਨੋਡ ਉਪਲੱਬਧ ਨਹੀਂ"
+
+#: json-glib/json-reader.c:583
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr ""
+
+#: json-glib/json-reader.c:646
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr ""
+
+#: json-glib/json-reader.c:653
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr ""
+
+#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "ਮੌਜੂਦਾ ਸਥਿਤੀ '%s' ਰੱਖਦੀ ਹੈ ਨਾ ਕਿ ਆਬਜੈਕਟ"
+
+#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
+#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
+#: json-glib/json-reader.c:1000
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "ਮੌਜੂਦਾ ਸਥਿਤੀ '%s' ਰੱਖਦੀ ਹੈ, ਮੁੱਲ ਨਹੀਂ"
+
+#: json-glib/json-reader.c:873
+msgid "The current position does not hold an integer type"
+msgstr ""
+
+#: json-glib/json-reader.c:918
+msgid "The current position does not hold a floating point type"
+msgstr ""
+
+#: json-glib/json-reader.c:963
+msgid "The current position does not hold a string type"
+msgstr ""
+
+#: json-glib/json-reader.c:1008
+msgid "The current position does not hold a boolean type"
+msgstr ""
diff --git a/po/pl.gmo b/po/pl.gmo
index fb1a03ad763ffb2ccbad93a2225ba101c74cdf9e..a79a8707c247f29badcea08d7e5727543a6a6dd9 100644
GIT binary patch
delta 26
icmcbscvo@5Qx0AuT>~>+V*>?4Q!68b&7U}4vjYHood~@E

delta 26
icmcbscvo@5Qx0B3T|)z1BQpg\n"
 "Language-Team: Polish \n"
@@ -72,31 +72,31 @@ msgstr "Dane JSON są puste"
 msgid "%s:%d: Parse error: %s"
 msgstr "%s:%d: błąd przetwarzania: %s"
 
-#: json-glib/json-path.c:380
+#: json-glib/json-path.c:375
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Dozwolony jest tylko jeden węzeł główny w wyrażeniu JSONPath"
 
-#: json-glib/json-path.c:389
+#: json-glib/json-path.c:384
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Po węźle głównym występuje nieprawidłowy znak \"%c\""
 
-#: json-glib/json-path.c:495
+#: json-glib/json-path.c:490
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Błędnie sformatowane wyrażenie plasterka \"%*s\""
 
-#: json-glib/json-path.c:539
+#: json-glib/json-path.c:534
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Nieprawidłowe określenie zestawu \"%*s\""
 
-#: json-glib/json-path.c:592
+#: json-glib/json-path.c:587
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Nieprawidłowe określenie plasterka \"%*s\""
 
-#: json-glib/json-path.c:620
+#: json-glib/json-path.c:615
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Nieprawidłowe określenie indeksu tablicy \"%*s\""
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
new file mode 100644
index 0000000000000000000000000000000000000000..bc7241ddbe9ea2c7c3f7fcf7b4d88f72dc817f59
GIT binary patch
literal 4153
zcmb7HO^h5z6|O)6VF>|Dh#@5KSY@7kC7C^nM`-_%!f2;Lm{10^b6%-M<2#2Yv#a2OfPO+Pwf=
z#P{!k3&4+nr-1(h_JAk9CPW`N0`mB~&G$cmC-5!44qpM!0#|`=1DApS1kM4EJ{aRU
z3w!`EO5l(1_k2c(4d8EpCxIUW*{_GcDZ~@N)4(q9=fJ0c?*N|!z7J$SJ_ddl_~1iA
zbbyZm&j8N>na5uPIqttT-=6~K@%_ZNgjfQ;4CFX}2V^@RG~b^Ad0z4`Uf?f)%)>hk
z{vF8n{{!SWAOE%x7lA|IS>P>T7x-@=0e|ovA?^cm?)X8v1cn5{4RK;PJe+IhNv4Pm##@$NbM;rQePM??G7pJ`QJCkD)o*ey?kYDmCW!uKIx6Z
zk1!-tU+$36iYiqNl@-fjcA@jV^XF+;d-5Yi))-IPWQqz$W{dpJSkW&#ZcgmFke1Rp
zn(L%VrU~08@oB)GR@o}
zCnaVt9Z3t_C>v5NHX(}E@P1v)K^IXv61GBWjV1hURVcx4P@KxThu`T-SGNREW|Rve
z9GNmhv_oS`1^cYpJ@)RnVyiSV2xM#uPR6P6lWxHI}ttg>RZzUakJjLhcan2f(%?akSAl9wna+_Svl55Ix
zxfsxOXLOR6#gHoLz}w7*;`*4ZxV*@c^L6f$O*5d8_v69wh~7gOM2{Ap8}xh6^cH$O
zOiVV^cEN7#nb%JiUZDPoLH~uM*T=k9;AgUFrFNzC+;T3-p)FKNSI}BsAIXuXGr1f(
z{yLXes7l?`R4-zk&TE;gWK+p%K2dgUi~Z9Se=a_y=|x&Nc6#R3nbQ0oglObP|O|NOYR(sM_KvSh&8nMc2ZoLnRzq?JGq4&NKgJkRu(sCatrm5
zd@(jO+i|mEb@HB}(c~s~Y;M>zMxjTw3H@B{wnt1(XT=h?JMP_bI)Dzrk!4a`2;F(|
zN8S-pO>S!h#$B1V;hH71^I2{v2Tw=OyIyOAFuQkNcmKX=aC6@*aZQ#m(bV782-;_8
zrrhsQt3qgPM-~@kW?W=-8yYo^??K$(8~;CVrvgFTk&!TQWpbOle28&NL2;Z4xP5Gv
zWbHy)bi*)0=k7gaOI(yCa@W=t*vHh!PDpR?@K?B`;E;r?2QnOQ08*?fJwm=YlUd=$
z5X|ju97kx2`>Mxsjz<8Y_(^+e~iL4mnl0At3vz3fnf<84j0?^MwF%XmsLKUh`ap
zkT$I!x4$NNoFvF$EjSZw?$^~k*E#ke250J4#jNR8pWQ?4z=a$9?p?UFKWMlTWanA$
zup1QKbbf=o@;;6ZoQ_yQD{O6*HHgFkJLJMByF*Uqj$h!!e$l5)wchj5Bo&=x5?S2$
zw15xXy)1|%BOmRlo$X|^oKzHcoGS={RS8+kO6n10(aQFV^5d)?ewQY@2X7N=TPReK
x3*|gcV*GCaT)^SE%lhSbzs4bxvBFB+3<}+, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: json-glib master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
+"glib\n"
+"POT-Creation-Date: 2012-06-30 15:20+0100\n"
+"PO-Revision-Date: 2012-02-19 23:29-0200\n"
+"Last-Translator: Gabriel Speckhahn \n"
+"Language-Team: Brazilian Portuguese \n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Virtaal 0.7.0\n"
+"X-Project-Style: gnome\n"
+
+#: json-glib/json-gobject.c:934
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "Objeto JSON esperado, porém o nó raiz é do tipo \"%s\""
+
+#: json-glib/json-gvariant.c:539
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Tipo inesperado \"%s\" no nó JSON"
+
+#: json-glib/json-gvariant.c:609
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "Faltam elementos no vetor JSON para que se forme uma tupla"
+
+#: json-glib/json-gvariant.c:637
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Símbolo de fechamento \")\" ausente no tipo de tupla GVariant"
+
+#: json-glib/json-gvariant.c:645
+msgid "Unexpected extra elements in JSON array"
+msgstr "Elementos adicionais inesperados no vetor JSON"
+
+#: json-glib/json-gvariant.c:924
+msgid "Invalid string value converting to GVariant"
+msgstr "Valor string inválido ao converter para GVariant"
+
+#: json-glib/json-gvariant.c:980
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+"Uma entrada de dicionário GVariant espera um objeto JSON com exatamente um "
+"membro"
+
+#: json-glib/json-gvariant.c:1236
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "Não há suporte para a classe GVariant \"%c\""
+
+#: json-glib/json-gvariant.c:1281
+msgid "Invalid GVariant signature"
+msgstr "Assinatura GVariant inválida"
+
+#: json-glib/json-gvariant.c:1326
+msgid "JSON data is empty"
+msgstr "Dados JSON vazios"
+
+#: json-glib/json-parser.c:818
+#, c-format
+msgid "%s:%d: Parse error: %s"
+msgstr "%s:%d: Erro na análise: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "Apenas um nó raiz é permitido em uma expressão JSONPath"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "Nó raiz seguido de caractere inválido \"%c\""
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Expressão de corte \"%*s\" má formada"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Definição de conjunto \"%*s\" inválida."
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Definição de corte \"%*s\" inválida"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Definição de índice de vetor %*s\" inválida"
+
+#: json-glib/json-reader.c:463
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "O nó atual é do tipo \"%s\", mas um vetor ou objeto era esperado."
+
+#: json-glib/json-reader.c:475
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "O índice \"%d\" é maior do que o tamanho do vetor na posição atual."
+
+#: json-glib/json-reader.c:492
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "O índice \"%d\" é maior do que o tamanho do objeto na posição atual."
+
+#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
+#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
+#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
+#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
+#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+msgid "No node available at the current position"
+msgstr "Nenhum nó disponível na posição atual"
+
+#: json-glib/json-reader.c:583
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "A posição atual detém um \"%s\" e não um vetor"
+
+#: json-glib/json-reader.c:646
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "O nó atual é do tipo \"%s\", mas um objeto era esperado."
+
+#: json-glib/json-reader.c:653
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "O membro \"%s\" não está definido no objeto na posição atual."
+
+#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "A posição atual detém um \"%s\" e não um objeto"
+
+#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
+#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
+#: json-glib/json-reader.c:1000
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "A posição atual detém um \"%s\" e não um valor"
+
+#: json-glib/json-reader.c:873
+msgid "The current position does not hold an integer type"
+msgstr "A posição atual não detém um tipo inteiro"
+
+#: json-glib/json-reader.c:918
+msgid "The current position does not hold a floating point type"
+msgstr "A posição atual não detém um tipo de ponto flutuante"
+
+#: json-glib/json-reader.c:963
+msgid "The current position does not hold a string type"
+msgstr "A posição atual não detém um tipo string"
+
+#: json-glib/json-reader.c:1008
+msgid "The current position does not hold a boolean type"
+msgstr "A posição atual não detém um tipo booleano"
diff --git a/po/ru.gmo b/po/ru.gmo
new file mode 100644
index 0000000000000000000000000000000000000000..9dfe44585d2a658b9929d2f51af744518af6ed83
GIT binary patch
literal 5233
zcmb_eOK==V8E!&IK!it3z(9EXsfxUj?U83?$C$O&HpEWKB(haT2}uQt^zO7)W6w@+
z&CDuU6F`q539+#&fm}kx2jE6g$c{EvEK9C37Y?Cn=EjMFGaNZne1G>og%rt!W^4AF
zp6>pi-~adgZO7ej30z;t{T18~d_;&L;C*-D57z?l3&5+ulfXX%3&0&872+Y_81TzL
z4SX2*I*{f35%@LW2f#hRe*$*^cit@o0e1r*1wIKp0GtJ~-uHk9fqw_?1@8Qq)q5OR
z#P||05Bval2>2hM3;f1CLW}^XfIR=}*7z^L{TPdTVJqMO@Dy+kcmkLKbHJS+xBeUj
zJ_sKra2MYHctD6B0e=Vl0gyf^#3=A5K-RkqWV!zW9tRfgv+?;UFu?c*@DX6{Q$id8
zjsrd5WndNfZ{RUt>C?D@zXdAbJ)aTc954WW5BOIg&%2)$A_V>t_$=_Q`z<~X{65Bu
zt?~T`HqW00z5x7F3m^WR5YJ=$GvIT;e*ifThaV6EsW-U;2&79urGVSwtGJ=gT%79%
zaeo3gTowqwK)3|dik-L-ZUL9X=W+9eF!o){3FaEYV)%eGi!b4Z+X5zZF6JCxNRNPt
z=K3Q455|Q-uR!B6iWR9S(oum1WAQC|;u#tFGEB(x%ZaZ;88t|S3ID%TQ{^NkN#FVI
z=~JXjXECG~{bUMLvYZ4B(xIZNs+LqFPMFnxSm|HCmrC`7k|{-z)(M5$Q{=~_Cn;&v
z6umGQ=S0VZav>UiLD=O=7T15%JNOZ?6VFKmJM6!>nT1y&Y
zOa_xWsw$6SBOg(XR2+A08}l)OoN}NI#*J!82b3Gi!5b5~PJEJjEl?(KqPD1X;+dc#}#4pjBC=8d3|@*-_c6Ooo%sEH+yV-<_0~GJElscB-0_8;>dyy
zv438f-hgMD^$iGWbAAWXTABY)aki7$7{NMjL8e()#_i!Tj!+bJfk9R7X>;S>(HqLeu=6wM%)I@DDIEWSX}Wv=iBv4>`dqa
zO(jXKuy0?fUODdvfgG-cx~hhCRN03TSJ4kKFgA-^5j!w`dct{(a{_hF
zaipd|BW`}gaSuBCUCKXN7;*QwdDq24=Zu>6*{n6|@(0O1R2cc@9`^v&Jq0_RiAaWV
zAQL`vo~uVbJ*m$JdYVQXb+qhb=XA9p&-tMqj_OCSBdpYAML82nRtt2dj^+q*j2b7L
zaw9s{ai_buKv8{Q?Bv*qZmjad?!aRj{)R9BAudpYjO?og(hm<4cOskx#iu78cMf&e
zv7wVHa!!P0?V%?Z=upW|2F3#z8aR)mo5lqSYi1Z1_a7$vSbQWL%)7;6o_6gbesmuy
z=JRxvT*7jUj}%ARQ=`QL{AhN#qj{HJe%Wrp8g~eL^4K#nba>!d=Lr?6$cF7HeGcaz
zY9l{9GSEKD(<|9)=~8+%y^$_ZHj^%-*D+Y-Cv&!^e@K_pW_lC%N;XH?EQYJ;wR9ny
z$u4)!EJ_#gb~$~Imr;5(yO7Og7YXmKX0PMjjcg9jH|^n)%@STMLhDL4i-~Kz3C|a>
zAbZuQTjA9ry#j$tSho?ym5lH
zEU*8X%Y$9d$
zGDR%y46Qf}Jb9xhbiYF2EkT-=LC7`JVcz_MKzO>8&Dj{U#|u!s1SJ<+R$;{j^V;y!
z#CbiZuB?@6Si_DZ8#CZ1)BaNSa|i&zI43uakIRV55Yy&bi-!nDlWU>HI0UZ!^#x9^
zRl=rI_6x&-R+(iNj4WnUJNIqRZS0_Ym4g8Fwlet1#*OR1>d)py`X-yeWSWQBO_*)?
zc^zwCf%!{d;aYQy&+Y1A0sj-cC6fg6)rJ79vZL^zQ}j@XR)E-p0?cw#=o=R(*WpH`
zYa-9d2YdSJ&s3si`f!LNWiHh!y{3tl(;AR*c|*n&dm0JKh+zKEsG?G@fb
z)9n@9!^zDBqd+?68P}r6VZa9lcL;oWfUdUrqx138ngeeuoWD~AJ?5tiTTlS9n&X+R
zH%T-f2Ysh^_6C3Tp!@gAZbCL6)7=izKEv#X1INIecHE%NS%n5>%C~c_Y, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: json-glib master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
+"glib\n"
+"POT-Creation-Date: 2012-06-30 15:20+0100\n"
+"PO-Revision-Date: 2012-06-16 08:29+0400\n"
+"Last-Translator: Yuri Kozlov \n"
+"Language-Team: Russian \n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 1.2\n"
+
+#: json-glib/json-gobject.c:934
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "Ожидается объект JSON, но корневой узел имеет тип «%s»"
+
+#: json-glib/json-gvariant.c:539
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Неожиданный тип «%s» в узле JSON"
+
+#: json-glib/json-gvariant.c:609
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "Отсутствуют элементы в массиве JSON для соответствия кортежу"
+
+#: json-glib/json-gvariant.c:637
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Отсутствует закрывающий символ «)» в кортеже типа GVariant"
+
+#: json-glib/json-gvariant.c:645
+msgid "Unexpected extra elements in JSON array"
+msgstr "Неожиданные дополнительные символы в массиве JSON"
+
+#: json-glib/json-gvariant.c:924
+msgid "Invalid string value converting to GVariant"
+msgstr "Некорректное строковое значение для преобразования к GVariant"
+
+#: json-glib/json-gvariant.c:980
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+"Элемент словаря GVariant должен быть объектом JSON с единственным членом"
+
+#: json-glib/json-gvariant.c:1236
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "Класс GVariant «%c» не поддерживается"
+
+#: json-glib/json-gvariant.c:1281
+msgid "Invalid GVariant signature"
+msgstr "Недопустимая подпись GVariant"
+
+#: json-glib/json-gvariant.c:1326
+msgid "JSON data is empty"
+msgstr "Данные JSON отсутствуют"
+
+#: json-glib/json-parser.c:818
+#, c-format
+msgid "%s:%d: Parse error: %s"
+msgstr "%s:%d: Ошибка разбора: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "В выражении JSONPath может быть только один корневой узел"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "Корневой узел заканчивается некорректным символом «%c»"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Неправильное выражение среза «%*s»"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Неверное определение присвоения «%*s»"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Неверное определение среза «%*s»"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Неверное определение индекса массива «%*s»"
+
+#: json-glib/json-reader.c:463
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "Текущий узел имеет тип «%s», но ожидается массив или объект."
+
+#: json-glib/json-reader.c:475
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "В текущей позиции индекс «%d» больше размера массива."
+
+#: json-glib/json-reader.c:492
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "В текущей позиции индекс «%d» больше размера объекта."
+
+#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
+#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
+#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
+#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
+#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+msgid "No node available at the current position"
+msgstr "В текущей позиции отсутствует узел"
+
+#: json-glib/json-reader.c:583
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "В текущей позиции содержится «%s» и это не массив"
+
+#: json-glib/json-reader.c:646
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "Текущий узел имеет тип «%s», но ожидается объект."
+
+#: json-glib/json-reader.c:653
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "В текущей позиции член «%s» не определён в объекте."
+
+#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "В текущей позиции содержится «%s» и это не объект"
+
+#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
+#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
+#: json-glib/json-reader.c:1000
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "В текущей позиции содержится «%s» и это не значение"
+
+#: json-glib/json-reader.c:873
+msgid "The current position does not hold an integer type"
+msgstr "В текущей позиции не содержится значения целого"
+
+#: json-glib/json-reader.c:918
+msgid "The current position does not hold a floating point type"
+msgstr "В текущей позиции не содержится значения с плавающей точкой"
+
+#: json-glib/json-reader.c:963
+msgid "The current position does not hold a string type"
+msgstr "В текущей позиции не содержится значения строки"
+
+#: json-glib/json-reader.c:1008
+msgid "The current position does not hold a boolean type"
+msgstr "В текущей позиции не содержится логического значения"
diff --git a/po/sl.gmo b/po/sl.gmo
new file mode 100644
index 0000000000000000000000000000000000000000..3cc4e0ed1ec4bcfd31f055f7f53445d0d2b30daa
GIT binary patch
literal 4209
zcmb7HO>87b6|O+|GvRLuS$+Z(5@xbLJv-z5$ub+WyLg>o)?-_{-W8mnrn}s(nVPCm
zRd**IQ(u}Gtd5x;rTA!7x6y-3}fej&wT=a@cae%0`Ohn8t`wx9`MX38T%fv5Bw(30>2OZ
z4Up`-1N;u~ec%P)N5C_{v(GZdf#-o&fp>vdfWHFLx_<>;1O5wm5qS1faosz>WsH9d
z>;m5hUI+dU*a5!$X~vd-yFi-%V?F){@G{2iGw>B~1-Jox3%CmW0N4Va{cMcqCNM{g
zq8|T!fw9||{|NXKVDkCMRRyHDe-9-6ckA&#fyB#yfE3>g&qe;$fr}WYK#KR*z?XsV
z0V&@90)Gfhz7W6XKw9rlK#Kd{z>B~ie37v>@IH{%c?(G2|6G6n0C*l__9fT?Tmaqz
z{v5ah`~#5eeF%IB_~MsiepZ3c&=@a0NEex42%CKyFQ&soF@Fp1=kOv#2KpK3Vqd{~
z7BA>#aFu-xFFl~~$U`+jwT5s*Js{2O8+hS1dmeA|P|eYU^sujnUyOa7aMAY`vmW0P
z&Py(xv#!S%J-f|cdnlX|rr?=M3uTRPdt91={=PAhY2mrxKfS-X!R=s(A%9&JyO>`f&9<)Uw~Ll;slyyvaO
zv<1O}`*Jd|u8p)MZbVT!c{nAU6MI~lOuoT0xucAtXkhF-R%rCSM4ZP?
zYL&_prVB^W!I4t()S61Vf<6@X&@C2-%0wY3Mme4od#o??j&)<1aUbl1RVTfl`PNq$
z!A`1eK)*L0Sj}7KT8JhvcgRmsPP7cfu|`X3IYzoX$%fS<4{!=D(!%7Q;6amZ*q8uO
z38lpVwnWTLS~>?Sd;%AUHnwT%>>kOQ(AvI^NU&BciY*a}p^1pyJIwKptz`$4l$gDA
zS2)y-bRorT8%5D9{A69UP#3Xu1l9_vwT|O=Q-uQjhKiF}`}CGRR=Xj9XIA=9gu7N}
zh<0GDmRO&v_Q-n2YV2q$LV--I0=1`C^s&%RtzbZKA#>1ryb47@JDGR|jadjy#A2Qw
z&U}qJ8BeDYSr0mKf3_Ag6u0NOlY+{j*d=CB4qi=V=neQCvwlp0#+*NewL0@Bnv0z*
zas=3xdrO@Qoo=TC!Q`H-
z6uC8%>n0Fgy2iWLdsl0@b@-WVJ7K&Q1syqk7#;ElZXnFTzB<_FuZ-zSdCOO3=IDYTf=@Uvvg%1jl>iY@7Q1}W>C4_7zVZqKF~)*d5lHhJHcE|n`WrXDYg9R$_f
z3pT_=j0AULda$ph8OlnSp$Jz5;$FDJGmcLj@+L;*P~xY|#yC>L!87GJk%bvqTp!dJ
z4OCmCSlcmbIcUI);ZJB?B95IF>~a?GolYg-mKhLMUadJ91@HHuM64))=P9cVQQm?1Fo(oV#YhiJh$}udViaxZH{e$4f8Xnz^;uK9zx(pW|)ZX?hp@z, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: json-glib master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
+"glib\n"
+"POT-Creation-Date: 2012-06-30 15:20+0100\n"
+"PO-Revision-Date: 2011-12-26 18:50+0100\n"
+"Last-Translator: Matej Urbančič \n"
+"Language-Team: Slovenian GNOME Translation Team \n"
+"Language: sl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
+"X-Poedit-Country: SLOVENIA\n"
+"X-Poedit-Language: Slovenian\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: json-glib/json-gobject.c:934
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "Pričakovan je predmet JSON, vendar pa je korensko vozlišče vrste `%s'"
+
+#: json-glib/json-gvariant.c:539
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Nepričakovana vrsta '%s' v vozlišču JSON"
+
+#: json-glib/json-gvariant.c:609
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "Manjkajo predmeti v polju JSON za skladnost z n-terico."
+
+#: json-glib/json-gvariant.c:637
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Manjka zaključni znak ')' v vrsti n-terice GVariant"
+
+#: json-glib/json-gvariant.c:645
+msgid "Unexpected extra elements in JSON array"
+msgstr "Nepričakovan dodatni predmet polja JSON"
+
+#: json-glib/json-gvariant.c:924
+msgid "Invalid string value converting to GVariant"
+msgstr "Neveljavna vrednost niza med pretvarjanjem v GVariant"
+
+#: json-glib/json-gvariant.c:980
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr "Slovar GVariant pričakuje predmet JSON z natanko enim določilom"
+
+#: json-glib/json-gvariant.c:1236
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "Razred GVariant '%c' ni podprt."
+
+#: json-glib/json-gvariant.c:1281
+msgid "Invalid GVariant signature"
+msgstr "Neveljaven podpis GVariant"
+
+#: json-glib/json-gvariant.c:1326
+msgid "JSON data is empty"
+msgstr "Podatki JSON so prazni"
+
+#: json-glib/json-parser.c:818
+#, c-format
+msgid "%s:%d: Parse error: %s"
+msgstr "%s:%d: Napaka razčlenjevanja: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "Le eno korensko vozlišče je dovoljeno v izrazu JSONPath"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "Korensko vozlišče se konča z neveljavnim znakom '%c'"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Napačno oblikovan izraz rezine '%*s'"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Neveljavno določilo '%*s'"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Neveljavno določilo rezine '%*s'"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Neveljavno določilo kazala polja '%*s'"
+
+#: json-glib/json-reader.c:463
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "Trenutno vozlišče je vrste '%s', pričakovano pa je polje ali predmet."
+
+#: json-glib/json-reader.c:475
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "Kazalo '%d' je večje od velikosti polja na trenutnem položaju."
+
+#: json-glib/json-reader.c:492
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "Kazalo '%d' je večje od velikosti predmeta na trenutnem položaju."
+
+#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
+#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
+#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
+#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
+#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+msgid "No node available at the current position"
+msgstr "Na trenutnem položaju ni razpoložljivega vozlišča."
+
+#: json-glib/json-reader.c:583
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "Trenutni položaj vsebuje '%s' in ne polja"
+
+#: json-glib/json-reader.c:646
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "Trenutno vozlišče je vrste '%s', pričakovan pa je predmet."
+
+#: json-glib/json-reader.c:653
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "Določilo '%s' ni določan v predmetu na trenutnem položaju."
+
+#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "Trenutni položaj vsebuje '%s' in ne predmeta"
+
+#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
+#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
+#: json-glib/json-reader.c:1000
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "Trenutni položaj vsebuje '%s' in ne vrednosti"
+
+#: json-glib/json-reader.c:873
+msgid "The current position does not hold an integer type"
+msgstr "Trenutni položaj ne vsebuje celega števila"
+
+#: json-glib/json-reader.c:918
+msgid "The current position does not hold a floating point type"
+msgstr "Trenutni položaj ne vsebuje plavajoče vejice"
+
+#: json-glib/json-reader.c:963
+msgid "The current position does not hold a string type"
+msgstr "Trenutni položaj ne vsebuje niza"
+
+#: json-glib/json-reader.c:1008
+msgid "The current position does not hold a boolean type"
+msgstr "Trenutni položaj ne vsebuje logične izraza"
diff --git a/po/sv.gmo b/po/sv.gmo
new file mode 100644
index 0000000000000000000000000000000000000000..f7d9ee7f885a7885af67881d521fc4353bad0ffa
GIT binary patch
literal 2349
zcmb7FOK)366dvdUFprilKp>D#BdoM4*RdVZMmGr*k`x8yrPS>fjqe>_PduKv%#2OV
z58w|VRv^Tp5gQh;sn~nN1`vOM4LkS`h;Qz7oQ9^A8ENk4Gjq0z(vTv0XKkW&N4O++ysVmKLP%PGrs`73VG{%xt;=FgZw!#`2QC8
zGVpg`i0@Bei08sH<^IY9`@jXPe>1^ffg#R+fY*UHo-Jh!T!Z`_@Gaoqz)+`)&oPE@
z*h`o%VnSpHtvDM;GNgNAJP!%3ixFxa#)T3XQZ7aXU$|%IO7X<^BBU3>O4Y^HG^Ran
zogiVYu`yL0`|vKel50Qra^s|z
zMzei`kP6+7QObNOQfiM#P9jUX-15W=TZGSAr+A>$2v;Q5H7X@eZDW++n*1mivsrYM
z;YC)tk%(<}!%1~!Hqc1Siwx;J-XvtMaC$nYTWI3e^3ne@G3^79
z_`;?y`t73b2m^f$HzySxsnH;b;-V9!^5Z&NV|TQ;m%|+_#65302_^byz6%bDOH)Sp
zkX|TDnfZ}QxEgHFnh;mCnMQYob+|V%9XO+-Ov!d-UxfP{ZM#gS(FcRfMJ*Fk*ZVwP
zSZEKj&!kekmTA)$HDj{{gdpt4*r+9$d@r{q9VCAB*x%l6D_XMxR{|%jb1!0Q)*H>J
zemz>OQ{$buS-)0q)a#YK-DqD7Wr*j5UL$HYsa}s4mrA`Y?tIj;Tsy^mc%AE9OQC3I
zq|jg#c_lYD(_&3emTFGCTiN0|8}Lj-Ey4RS-NxgPu1hOEkKFL4k`B&lg>XVWCO52X
zZ*FfK7pqaLSJn*j)(8YOj>)4X3%TM_FH?ABPWaV3ty|I3v0ezcBW$#x6O-c6$F$Uz
zzOttVmaFKNv3(bl&I{44HkYaVxq3y@N+s&l%GMlnYbi_^59X!7AeVq-*_iZX%ujD3C(3MBWr`XPeyK~Z#YX*%Nv>Hr)wBohqBhhBg#MADmNz~29l
zHFD9SJ3dqjT@HB>Gz)@qy}$vp8FbXhd#>Ef29wgvtlt%CCjUj6ZjMaSon+%Zl?`}u
zCXX5((bE$v_NW=o3$)YoY+IzD6YvS{4nhj8Eec$aloXbOrzW~+(rK-&v0cQjJ;xta
bK~T|zpkNs2DJtpdNGbHIJZrLzYr*~nkzUFZ

literal 0
HcmV?d00001

diff --git a/po/sv.po b/po/sv.po
new file mode 100644
index 0000000..f69666a
--- /dev/null
+++ b/po/sv.po
@@ -0,0 +1,167 @@
+# Swedish translation for json-glib.
+# Copyright (C) 2012 Free Software Foundation, Inc.
+# This file is distributed under the same license as the json-glib package.
+# Daniel Nylander , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: json-glib\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
+"glib\n"
+"POT-Creation-Date: 2012-06-30 15:20+0100\n"
+"PO-Revision-Date: 2012-01-22 00:38+0100\n"
+"Last-Translator: Daniel Nylander \n"
+"Language-Team: Swedish \n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: json-glib/json-gobject.c:934
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr ""
+
+#: json-glib/json-gvariant.c:539
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Oväntad typ \"%s\" i JSON-nod"
+
+#: json-glib/json-gvariant.c:609
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr ""
+
+#: json-glib/json-gvariant.c:637
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr ""
+
+#: json-glib/json-gvariant.c:645
+msgid "Unexpected extra elements in JSON array"
+msgstr "Oväntade extra-element i JSON-array"
+
+#: json-glib/json-gvariant.c:924
+msgid "Invalid string value converting to GVariant"
+msgstr "Ogiltig strängvärdeskonvertering till GVariant"
+
+#: json-glib/json-gvariant.c:980
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+
+#: json-glib/json-gvariant.c:1236
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "GVariant-klassen \"%c\" stöds inte"
+
+#: json-glib/json-gvariant.c:1281
+msgid "Invalid GVariant signature"
+msgstr "Ogiltig GVariant-signatur"
+
+#: json-glib/json-gvariant.c:1326
+msgid "JSON data is empty"
+msgstr "JSON-data är tom"
+
+#: json-glib/json-parser.c:818
+#, c-format
+msgid "%s:%d: Parse error: %s"
+msgstr "%s:%d: Tolkningsfel: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr ""
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "Rotnod efterföljd av otillåtet tecken \"%c\""
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr ""
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr ""
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr ""
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr ""
+
+#: json-glib/json-reader.c:463
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr ""
+
+#: json-glib/json-reader.c:475
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr ""
+
+#: json-glib/json-reader.c:492
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr ""
+
+#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
+#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
+#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
+#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
+#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+msgid "No node available at the current position"
+msgstr "Ingen nod tillgänglig på aktuell position"
+
+#: json-glib/json-reader.c:583
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "Aktuell position innehåller en \"%s\" och inte en array"
+
+#: json-glib/json-reader.c:646
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr ""
+
+#: json-glib/json-reader.c:653
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "Medlemmen \"%s\" är inte definierad i objektet på aktuell position."
+
+#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "Aktuell position innehåller en \"%s\" och inte ett objekt"
+
+#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
+#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
+#: json-glib/json-reader.c:1000
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "Aktuell position innehåller en \"%s\" och inte ett värde"
+
+#: json-glib/json-reader.c:873
+msgid "The current position does not hold an integer type"
+msgstr "Aktuell position innehåller inte en heltalstyp"
+
+#: json-glib/json-reader.c:918
+msgid "The current position does not hold a floating point type"
+msgstr "Aktuell position innehåller inte en flyttalstyp"
+
+#: json-glib/json-reader.c:963
+msgid "The current position does not hold a string type"
+msgstr "Aktuell position innehåller inte en strängtyp"
+
+#: json-glib/json-reader.c:1008
+msgid "The current position does not hold a boolean type"
+msgstr "Aktuell position innehåller inte en boolesk typ"
diff --git a/po/tr.gmo b/po/tr.gmo
new file mode 100644
index 0000000000000000000000000000000000000000..ac6b9c0ec1602e720da8b3482a55c494503a6c2e
GIT binary patch
literal 4101
zcmb7GO^h5z6|O)aWC^yxIriEsvxyKFQZrrCQ|a!i
zQB}2*-Wy0rhyxeIiNkWs5mu2_LfYF*q=1YN*Bqjpa><<=i0@VP%y=!Y*KTd^H{DgQ
z>b>uM^
zj_2P4yTDt()4=}$JHVH}%Gerk1f=mlHP8P9zJO=;2z&*+2)qXTHSi+v-@q2|_}5}Q
zXMz6$2Lj0PzPl9dZUE2X`Omd-c#{C?S;=R=15J>y}2KWTvhU-j80eyyDUL^RBLoKe
z86?5Jh5I;e(9Pf)dkQyQpz**(9Ff)#R?q{|%)Wyg?y)Cv&o0s&T}Ti6cKF5EGla{o
zx19F)rm#+OX|1t6zUJ%+ud=-@~t`M~I#(t3K~&D<>(h)RVQ6r(K1zGfSu7#ds3l)JD#Shdo*
zg>M@QPgrMAn1HS>`=;Qn=Ua#-FgNGNSK~qk;@Hee7P3UT9L){8M;_o5T%?W3Kf!|~
zyJlhn#7&_J(Z^aM=4Mb?i&gj-E)Z?(x^A+2AZwy1%zKCgdqq)fiXetrMC`^q$3xT1
z?Nd@>_68$ip&MyKirE%KG28e~U9_N!C>?>lLTZiW_&rmh0KY+TGHu`gN=I7H2;ixa
zE{JesiWJfIjVUDdC)FOB%q3f<$4B0ed#kJcD%(~?A=;TXrED9U
zt>TDF`%4V82bnrMwkE9xeto{|(&qK88>T6Q^^Y*-hHXJ);Zbf
zb~>1t+>kdFxwV+rO}h9y#k*_0?&*`AHO#vTKa(vhv@3+Cma|cfL|LK=UqLD0uawPW
zJ3p6|s7dXCDPM(^&MJ|~WJ`*&$G0k*D>ve=gg_EheaxQ4w3yxF-Y#ui-nh6RtlRD^
zT`&k*!wc|?DM-uexDZO8;Z%;$5Z2$?dLuc#m`C0YrA;pCfk{!Ad;D}?`K8UGvZ6@d
zKuL8yuE*igt#{Ax_;bB;X6fh2C8?#2p}?m5{hVjYrl5I+dr@*zfV7|tCOQ-0~Of=GIdefJAfo@Ez
zg?50Ki}za9#;$OIt@FuV&eO^MbZ4?(PWD41=6Jx=K;dQ
z4!WeJ*d;mnfYiCYa9x$#6w_@(soGX3Q4|Nlz-nb!jr#J!K8G7Q#3BOpTFJAyXV^ZYwm#jFR>cmD)=kdz%||=zO64kBRQUX%9n?@DM1^33
zd-HE2G+7VtXZ-M7jD-h{4j(@TnF{S%=1%3!HvnQrH%FtSY^7u_c~#@wB6c*RTG_H%h, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: json-glib master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
+"glib\n"
+"POT-Creation-Date: 2012-06-30 15:20+0100\n"
+"PO-Revision-Date: 2011-11-16 12:18+0200\n"
+"Last-Translator: Muhammet Kara \n"
+"Language-Team: Turkish \n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Lokalize 1.2\n"
+
+#: json-glib/json-gobject.c:934
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "Bir JSON nesnesi bekleniyor, ama kök düğümü `%s' türünde"
+
+#: json-glib/json-gvariant.c:539
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "JSON düğümünde beklenmeyen '%s' türü"
+
+#: json-glib/json-gvariant.c:609
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "JSON dizisinin bir demete uyması için gereken öğeler eksik"
+
+#: json-glib/json-gvariant.c:637
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "GVariant demeti türünde kapatma sembolü ')' eksik"
+
+#: json-glib/json-gvariant.c:645
+msgid "Unexpected extra elements in JSON array"
+msgstr "JSON dizisinde beklenmeyen ek öğeler"
+
+#: json-glib/json-gvariant.c:924
+msgid "Invalid string value converting to GVariant"
+msgstr "GVariant'a dönüştürmede geçersiz dizge değeri"
+
+#: json-glib/json-gvariant.c:980
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+"Bir GVariant sözlük girdisi, tam olarak bir üyesi olan JSON nesnesi bekler"
+
+#: json-glib/json-gvariant.c:1236
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "GVariant sınıfı '%c' desteklenmiyor"
+
+#: json-glib/json-gvariant.c:1281
+msgid "Invalid GVariant signature"
+msgstr "Geçersiz GVariant imzası"
+
+#: json-glib/json-gvariant.c:1326
+msgid "JSON data is empty"
+msgstr "JSON verisi boş"
+
+#: json-glib/json-parser.c:818
+#, c-format
+msgid "%s:%d: Parse error: %s"
+msgstr "%s:%d: Ayrıştırma hatası: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "JSONPath ifadesinde yalnızca bir kök düğümüne izin verilir"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "Kök düğümünü izleyen '%c' karakteri geçersiz"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Kusurlu dilim ifadesi '%*s'"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Geçersiz küme tanımı '%*s'"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Geçersiz dilim tanımı '%*s'"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Geçersiz dizi indisi tanımı '%*s'"
+
+#: json-glib/json-reader.c:463
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "Geçerli düğümün türü '%s', ama bir dizi ya da bir nesne bekleniyordu."
+
+#: json-glib/json-reader.c:475
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "'%d' indisi, geçerli konumdaki dizinin boyutundan daha büyük."
+
+#: json-glib/json-reader.c:492
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "'%d' indisi, geçerli konumdaki nesnenin boyutundan daha büyük."
+
+#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
+#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
+#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
+#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
+#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+msgid "No node available at the current position"
+msgstr "Geçerli konumda kullanılabilir düğüm yok"
+
+#: json-glib/json-reader.c:583
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "Geçerli konum bir dizi değil '%s' bulunduruyor"
+
+#: json-glib/json-reader.c:646
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "Geçerli düğümün türü '%s', ama bir nesne bekleniyordu."
+
+#: json-glib/json-reader.c:653
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "'%s' üyesi, geçerli konumdaki nesnede tanımlı değil."
+
+#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "Geçerli konum bir nesne değil '%s' bulunduruyor"
+
+#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
+#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
+#: json-glib/json-reader.c:1000
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "Geçerli konum bir değer değil '%s' bulunduruyor"
+
+#: json-glib/json-reader.c:873
+msgid "The current position does not hold an integer type"
+msgstr "Geçerli konum bir tamsayı türü bulundurmuyor"
+
+#: json-glib/json-reader.c:918
+msgid "The current position does not hold a floating point type"
+msgstr "Geçerli konum bir kayan noktalı tür bulundurmuyor"
+
+#: json-glib/json-reader.c:963
+msgid "The current position does not hold a string type"
+msgstr "Geçerli konum bir dizge türü bulundurmuyor"
+
+#: json-glib/json-reader.c:1008
+msgid "The current position does not hold a boolean type"
+msgstr "Geçerli konum bir  mantıksal doğru/yanlış türü bulundurmuyor"
diff --git a/po/vi.gmo b/po/vi.gmo
new file mode 100644
index 0000000000000000000000000000000000000000..4a7f93c4c8795d656945785cec1811803c799de3
GIT binary patch
literal 4217
zcmbVPU2GiH6~3jkX$}3O|Fob}gtZFEY}ST^bc0KpA7~ovSiuCUKG3@}*E5&Q-n*T-
zW7s_O1+@{1S~U*{Rj49v1SnKdgFpg#iK=R&NR?W(4}GiDY99N7#A78M`kgzw>vdws
zc1N21c6RPL_nh;6=Un?=cisN7z;!R~Z{xo66GH3+ehlR6!fir)4Y&+E27Djb1m5;Z
zA-)5g0p1OK7I;7K43Pc224tTf0CxfZ3A_uq<8~nkcsFn_@Br{3;7@_P?;F5&g44!`moC1CT+za9ZDeQDekQD*b8L49QXs^1t7=!AK=r#dp;+`abN*_82Be3=lfqE`&7$my~h*`9ep9E+55E^Udb$zUD75}FHocwwb7gn
zoIQXYhW5Eao*TYQb*OIf+GU&_0x1-Q)-0*a@ej_9!V2wXOC!VK75!{3r5D36
zBXM%X@uD59Z80eodto9o=tgCpVzB^G3^%?}7d7ajl8(e)o?4p`z7JI>QD3h(71g)y
zX;bTA0VuL6_aaPe8X?=3wW-4XtlBmEZD_HWTImJSu^Oe_x?x@kZOaA*1$HV%SvNM}
zEVz@ot|(*VQpQk5{G<9XsczmhMf9aVkG!7S
zA`2A;Sgh(sxmEKfE$NBbW3xwBOF30&f6Qm54p8-Vrg30mc$hv>_FmD{
zN&3Ho;QN=u#2=}%W$*QnT-p0QT|2MK-iu~*K2TV$ylL=r**mYvUB6QHE@JZgxxG~O
zUey$#cqS=VUU$?kd%wX%#sf^??y@+%v9(FAUx6pnUvUH)&Le=NfP;`yTdsf{ZhUb(
z>A#Cr3F0P~VRK5cYiBh+K6=Gry#E88?q6N~{q)H2Vux+cifg|vd*@6-CQhzhk|=W7
zdx=9v>g{rcv+^e|ZEEStmCK#2F2*)1@3{?EKd$@BKCyEM2T>0e1x28)z+U}#xB@uBU1srZ
zKmv#v+kIp-#_?eNpoCr+9Qcbkz`e?_{hQ?749N`p?^Lvxz1IjLItLg1%Y=A(XL$~n
zz2EA(=kz6nZCS3DIydWVTsc1E)|!Ml52axo@FF~_Q0
z6VR|A)iFO1@3r&HP1PcU0wfUcd#osKg&W$YzMkK8RKFVy<(p&N|4qJ5tzWrenoQ9}
zO{c4(qy&Moj~+wG^<{%ugW-w7@IZWZG(a#JFt|36^p+gn5DNsniRbHAq?g;+
zgmX#%0_NS4Mm2r82CceX-+qRVcYF(T3IFOq`qiu$>;1vR9~, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: json-glib master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
+"glib\n"
+"POT-Creation-Date: 2012-06-30 15:20+0100\n"
+"PO-Revision-Date: 2012-06-30 10:26+0700\n"
+"Last-Translator: Nguyễn Thái Ngọc Duy \n"
+"Language-Team: Vietnamese \n"
+"Language: vi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: json-glib/json-gobject.c:934
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "Cần đối tượng JSON nhưng nút gốc thuộc loại '%s'"
+
+#: json-glib/json-gvariant.c:539
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Cần loại '%s' trong nút JSON"
+
+#: json-glib/json-gvariant.c:609
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "Thiếu phần tử trong mảng JSON để tuân thủ ống"
+
+#: json-glib/json-gvariant.c:637
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Thiếu dấu đóng ')' trong loại ống GVariant"
+
+#: json-glib/json-gvariant.c:645
+msgid "Unexpected extra elements in JSON array"
+msgstr "Cần phần tử bổ sung trong mảng JSON"
+
+#: json-glib/json-gvariant.c:924
+msgid "Invalid string value converting to GVariant"
+msgstr "Giá trị chuỗi chuyển đổi sang GVariant không hợp lệ"
+
+#: json-glib/json-gvariant.c:980
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr "Mục từ điển GVariant cần đối tượng JSON với duy nhất một phần tử"
+
+#: json-glib/json-gvariant.c:1236
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "Không hỗ trợ lớp GVariant '%c'"
+
+#: json-glib/json-gvariant.c:1281
+msgid "Invalid GVariant signature"
+msgstr "Chữ ký GVariant không hợp lệ"
+
+#: json-glib/json-gvariant.c:1326
+msgid "JSON data is empty"
+msgstr "Dữ liệu JSON rỗng"
+
+#: json-glib/json-parser.c:818
+#, c-format
+msgid "%s:%d: Parse error: %s"
+msgstr "%s:%d: Lỗi phân tích: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "Chỉ cho phép duy nhất một nút gốc trong biểu thức JSONPath"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "Ký tự không hợp lệ '%c' theo sau nút gốc"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Biểu thức chặt '%*s' hư"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Định nghĩa tập '%*s' không hợp lệ"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Định nghĩa chặt '%*s' không hợp lệ"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Định nghĩa chỉ mục mảng '%*s' không hợp lệ"
+
+#: json-glib/json-reader.c:463
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "Nút hiện thời loại '%s', nhưng đang cần mảng hoặc một đối tượng."
+
+#: json-glib/json-reader.c:475
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "Chỉ mục '%d' lớn hơn kích thước mảng tại vị trí hiện thời."
+
+#: json-glib/json-reader.c:492
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "Chỉ mục '%d' lớn hơn kích thước đối tượng tại vị trí hiện thời."
+
+#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
+#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
+#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
+#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
+#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+msgid "No node available at the current position"
+msgstr "Không có nút ở vị trí hiện thời."
+
+#: json-glib/json-reader.c:583
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr ""
+
+#: json-glib/json-reader.c:646
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "Nút hiện thời thuộc loại '%s', nhưng đang cần đối tượng."
+
+#: json-glib/json-reader.c:653
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "Chưa định nghĩa thành viên '%s' trong đối tượng tại vị trí hiện thời."
+
+#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "Vị trí hiện thời chứa '%s', không phải đối tượng"
+
+#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
+#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
+#: json-glib/json-reader.c:1000
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "Vị trí hiện thời chứa '%s', không phải giá trị"
+
+#: json-glib/json-reader.c:873
+msgid "The current position does not hold an integer type"
+msgstr "Vị trí hiện thời không phải kiểu số nguyên"
+
+#: json-glib/json-reader.c:918
+msgid "The current position does not hold a floating point type"
+msgstr "Vị trí hiện thời không phải kiểu số thực"
+
+#: json-glib/json-reader.c:963
+msgid "The current position does not hold a string type"
+msgstr "Vị trí hiện thời không phải kiểu chuỗi"
+
+#: json-glib/json-reader.c:1008
+msgid "The current position does not hold a boolean type"
+msgstr "Vị trí hiện thời không phải kiểu luận lý"
-- 
2.7.4



 

 
signature :
A valid GVariant type string, or NULL. [allow-none]
+A valid GVariant type string, or NULL. [allow-none]
 
 

 

 
Returns :

 A newly created GVariant compliant with
-signature, or NULL on error. [transfer full]
+signature, or NULL on error. [transfer full]
 
 

 
The length of json, or -1 if NULL-terminatedThe length of json, or -1 if NULL-terminated
 

 

 
signature :
A valid GVariant type string, or NULL. [allow-none]
+A valid GVariant type string, or NULL. [allow-none]
 
 

 
A newly created GVariant compliant with
-signature, or NULL on error. [transfer full]
+signature, or NULL on error. [transfer full]
 
 

 

 
Returns :
the parent node, or NULL if node is
+the parent node, or NULL if node is
 the root node. [transfer none]
 
 

 
a pointer to the node for the requested object
-member, or NULL. [transfer none]
+member, or NULL. [transfer none]
 
 

 
a copy of the node for the requested
-object member or NULL. Use json_node_free() when done. [transfer full]
+object member or NULL. Use json_node_free() when done. [transfer full]
 
 

 

 
Returns :

 the GParamSpec for the property
-or NULL if no property was found. [transfer none]
+or NULL if no property was found. [transfer none]