json: Bump up the requirement of json-glib
We're actually using a symbol (the JSON_NODE_HOLDS macro) that was defined in json-glib 0.10, so we need to bump up the dependency.
This commit is contained in:
parent
8a9890e138
commit
db1434ab71
2
README
2
README
@ -18,7 +18,7 @@ Clutter currently requires:
|
|||||||
|
|
||||||
Clutter also has optional dependencies:
|
Clutter also has optional dependencies:
|
||||||
|
|
||||||
• JSON-GLib >= 0.8 (optional, see --with-json below)
|
• JSON-GLib >= 0.10 (optional, see --with-json below)
|
||||||
• GDK-Pixbuf >= 2.0 (optional, see --with-imagebackend below)
|
• GDK-Pixbuf >= 2.0 (optional, see --with-imagebackend below)
|
||||||
|
|
||||||
On X11, Clutter depends on the following extensions
|
On X11, Clutter depends on the following extensions
|
||||||
|
@ -671,13 +671,13 @@ AS_CASE([$with_json],
|
|||||||
[system],
|
[system],
|
||||||
[
|
[
|
||||||
AC_MSG_CHECKING([for installed JSON-GLib])
|
AC_MSG_CHECKING([for installed JSON-GLib])
|
||||||
PKG_CHECK_EXISTS([json-glib-1.0 >= 0.8],
|
PKG_CHECK_EXISTS([json-glib-1.0 >= 0.10],
|
||||||
[have_json=yes],
|
[have_json=yes],
|
||||||
[have_json=no])
|
[have_json=no])
|
||||||
AS_IF([test "x$have_json" = "xyes"],
|
AS_IF([test "x$have_json" = "xyes"],
|
||||||
[
|
[
|
||||||
JSON_PREFIX=json-glib
|
JSON_PREFIX=json-glib
|
||||||
JSON_GLIB_PC="json-glib-1.0 >= 0.8"
|
JSON_GLIB_PC="json-glib-1.0 >= 0.10"
|
||||||
|
|
||||||
AC_DEFINE([HAVE_JSON_GLIB],
|
AC_DEFINE([HAVE_JSON_GLIB],
|
||||||
[1],
|
[1],
|
||||||
|
Loading…
Reference in New Issue
Block a user