brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2008-04-24 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* configure.ac: Add the --with-json configure switch to
	allow building Clutter with the external dependency on
	the system JSON-GLib; the default is to use the internal
	copy unless explicitly asked to check.
This commit is contained in:
Emmanuele Bassi 2008-04-24 18:53:43 +00:00
parent e261affeea
commit 76735c0374
2 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-04-24 Emmanuele Bassi <ebassi@openedhand.com>
* configure.ac: Add the --with-json configure switch to
allow building Clutter with the external dependency on
the system JSON-GLib; the default is to use the internal
copy unless explicitly asked to check.
2008-04-24 Emmanuele Bassi <ebassi@openedhand.com> 2008-04-24 Emmanuele Bassi <ebassi@openedhand.com>
* Makefile.am: Add HACKING.backends to the EXTRA_DIST. * Makefile.am: Add HACKING.backends to the EXTRA_DIST.

23
configure.ac
View File

@ -345,8 +345,26 @@ AC_SUBST([clutterbackendlib])
dnl ======================================================================== dnl ========================================================================
# if we have json-glib installed, use the system library instead of # allow building clutter with an external dependency on json-glib
# the internal copy # using the --with-json=check argument, but keep the default to
# the internal version
AC_ARG_WITH([json],
AC_HELP_STRING([--with-json=@<:@internal/check@:>@],
[Select the JSON-GLib copy to use @<:@default=internal@:>@]),
[],
[with_json=internal])
case $with_json in
internal|check) ;;
*) AC_MSG_ERROR([Invalid value for the JSON library: use internal or check]) ;;
esac
if test "x$with_json" = "xinternal"; then
JSON_PREFIX=json
have_json=no
else
# if the user asked for it and if we have json-glib installed,
# prefer the system library instead of the internal copy
AC_MSG_CHECKING([for installed JSON-GLib]) AC_MSG_CHECKING([for installed JSON-GLib])
PKG_CHECK_EXISTS(json-glib-1.0, [have_json=yes], [have_json=no]) PKG_CHECK_EXISTS(json-glib-1.0, [have_json=yes], [have_json=no])
if test "x$have_json" = "xyes"; then if test "x$have_json" = "xyes"; then
@ -358,6 +376,7 @@ else
JSON_PREFIX=json JSON_PREFIX=json
AC_MSG_RESULT([not found, using internal copy]) AC_MSG_RESULT([not found, using internal copy])
fi fi
fi
AC_SUBST(JSON_PREFIX) AC_SUBST(JSON_PREFIX)
AM_CONDITIONAL(LOCAL_JSON_GLIB, test "x$have_json" = "xno") AM_CONDITIONAL(LOCAL_JSON_GLIB, test "x$have_json" = "xno")