[gnome-color-manager] Make the clutter and mash dependency non-automagic (#654954)
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-color-manager] Make the clutter and mash dependency non-automagic (#654954)
- Date: Thu, 21 Jul 2011 08:26:00 +0000 (UTC)
commit fb9526078216a4b09f5f7127f1e9867ee82f5253
Author: Alexandre Rostovtsev <tetromino gmail com>
Date: Wed Jul 20 05:31:55 2011 -0400
Make the clutter and mash dependency non-automagic (#654954)
Ensure that there is a way of building gnome-color-manager without
clutter and 3D support on a system that happens to have clutter-gtk
and mash installed. (Gnome bug #654954)
Signed-off-by: Richard Hughes <richard hughsie com>
configure.ac | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ee1760e..02ad961 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,7 +97,13 @@ PKG_CHECK_MODULES(LCMS, lcms2 >= 2.2)
PKG_CHECK_MODULES(X11, x11)
PKG_CHECK_MODULES(COLORD, colord >= 0.1.9)
-PKG_CHECK_MODULES(CLUTTER, clutter-gtk-1.0 mash-0.1, has_clutter=yes, has_clutter=no)
+dnl **** Check for clutter ****
+AC_ARG_ENABLE(clutter, AS_HELP_STRING([--enable-clutter],[Enable clutter for 3D support]), enable_clutter=$enableval, enable_clutter=yes)
+if test x$enable_clutter != xno; then
+ PKG_CHECK_MODULES(CLUTTER, clutter-gtk-1.0 mash-0.1, has_clutter=yes, has_clutter=no)
+else
+ has_clutter=no
+fi
AM_CONDITIONAL(HAVE_CLUTTER, test x$has_clutter = xyes)
if test x$has_clutter = xyes; then
AC_DEFINE(HAVE_CLUTTER,1,[has clutter support])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]