From 66ba609f3b704b0950e4bd2b94b0ec9c485dc0b5 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 21 Sep 2010 13:15:56 +0100 Subject: [PATCH] Require the installed JSON-GLib Continue to provide the internal copy for 1.4, but require an explicit override to use it. The internal copy will be removed for Clutter 1.6. --- README | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README b/README index 9bc0974dc..5497c6ffd 100644 --- a/README +++ b/README @@ -312,6 +312,10 @@ Release Notes for Clutter 1.4 clutter-keysyms-compat.h header, which is included by clutter-keysyms.h unless CLUTTER_DISABLE_DEPRECATED is defined. +• The internal copy of json-glib is now deprecated. Building Clutter will + default to the system copy and requires an explicit --with-json=internal + to override the check. + Release Notes for Clutter 1.2 ------------------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 187a4a18f..47162df39 100644 --- a/configure.ac +++ b/configure.ac @@ -797,7 +797,7 @@ dnl === JSON parser check ===================================================== # we allow building clutter with the internal copy of json-glib # for platforms without it, but by default we depend on the # system copy -m4_define([default_json], [check]) +m4_define([default_json], [system]) AC_ARG_WITH([json], AC_HELP_STRING([--with-json=@<:@internal/check/system@:>@], [Select the JSON-GLib copy to use @<:@default=default_json@:>@]),