Merge branch 'system-json-glib'

* system-json-glib:
  [script] Simplify the parser code
  Update JSON-GLib dependency

diff --cc clutter/Makefile.am
index 6c2cda3,c636f3c..16c24c8
--- 1/clutter/Makefile.am
--- 2/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@@ -261,9 -264,9 +264,9 @@@ Clutter-@CLUTTER_API_VERSION@.gir: $(IN
                --include=Pango-1.0 \
                --include=PangoCairo-1.0 \
                --include=Cogl-@CLUTTER_API_VERSION@ \
-               --include=ClutterJson-@CLUTTER_API_VERSION@ \
+               $(json_gir_include) \
                --library=clutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@ \
 -              --libtool="$(top_builddir)/doltlibtool" \
 +              --libtool="$(top_builddir)/libtool" \
                --pkg gobject-2.0 \
                --pkg pango \
                --pkg pangocairo \

diff --cc configure.ac
Simple merge