isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 11:32:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Require the installed JSON-GLib

Browse Source 
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.
This commit is contained in:
Emmanuele Bassi 2010-09-21 13:15:56 +01:00
parent 4037f76a3e
commit 66ba609f3b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README
View File

@ -312,6 +312,10 @@ Release Notes for Clutter 1.4
clutter-keysyms-compat.h header, which is included by clutter-keysyms.h clutter-keysyms-compat.h header, which is included by clutter-keysyms.h
unless CLUTTER_DISABLE_DEPRECATED is defined. 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 Release Notes for Clutter 1.2
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
configure.ac
View File

@ -797,7 +797,7 @@ dnl === JSON parser check =====================================================
# we allow building clutter with the internal copy of json-glib # we allow building clutter with the internal copy of json-glib
# for platforms without it, but by default we depend on the # for platforms without it, but by default we depend on the
# system copy # system copy
m4_define([default_json], [check]) m4_define([default_json], [system])
AC_ARG_WITH([json], AC_ARG_WITH([json],
AC_HELP_STRING([--with-json=@<:@internal/check/system@:>@], AC_HELP_STRING([--with-json=@<:@internal/check/system@:>@],
[Select the JSON-GLib copy to use @<:@default=default_json@:>@]), [Select the JSON-GLib copy to use @<:@default=default_json@:>@]),