[gnome-color-manager] trivial: Support mash-0.2 as it's the same API as mash-0.1



commit 594f5e4b7e8a14362e5c258a8f0b3298b98b8576
Author: Richard Hughes <richard hughsie com>
Date:   Fri Sep 16 17:10:52 2011 +0100

    trivial: Support mash-0.2 as it's the same API as mash-0.1

 configure.ac |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9676026..efa4326 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,7 +97,16 @@ PKG_CHECK_MODULES(COLORD, colord >= 0.1.12)
 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)
+	# test for new mash
+	PKG_CHECK_MODULES(CLUTTER,
+			  clutter-gtk-1.0 mash-0.2,
+			  has_clutter=yes, has_clutter=no)
+	if test x$has_clutter == xno; then
+		# test for old mash
+		PKG_CHECK_MODULES(CLUTTER,
+				  clutter-gtk-1.0 mash-0.1,
+				  has_clutter=yes, has_clutter=no)
+	fi
 else
 	has_clutter=no
 fi



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]