[jhbuild/wip/conditions: 3/4] 3.12: use wayland condition flag

[Ryan Lortie <desrt src gnome org>]

commit 9aef7788e20463f63dc93f5d72d3c830fefb4c00
Author: Ryan Lortie <desrt desrt ca>
Date:   Mon Mar 3 13:26:06 2014 -0500

    3.12: use wayland condition flag
    
    Add some <if> to conditionalise wayland dependency.

 modulesets/gnome-suites-core-3.12.modules      |    4 ++-
 modulesets/gnome-suites-core-deps-3.12.modules |   37 ++++++++++++++++-------
 2 files changed, 29 insertions(+), 12 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.12.modules b/modulesets/gnome-suites-core-3.12.modules
index 96bce43..499ce20 100644
--- a/modulesets/gnome-suites-core-3.12.modules
+++ b/modulesets/gnome-suites-core-3.12.modules
@@ -331,7 +331,9 @@
     <suggests>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
-      <dep package="mutter-wayland"/>
+      <if condition-set="wayland">
+        <dep package="mutter-wayland"/>
+      </if>
     </suggests>
     <after>
       <dep package="librsvg"/>
diff --git a/modulesets/gnome-suites-core-deps-3.12.modules b/modulesets/gnome-suites-core-deps-3.12.modules
index 93b911e..299e154 100644
--- a/modulesets/gnome-suites-core-deps-3.12.modules
+++ b/modulesets/gnome-suites-core-deps-3.12.modules
@@ -306,28 +306,36 @@
     </dependencies>
   </autotools>
 
-  <autotools id="cogl" autogenargs="--enable-wayland-egl-platform --enable-wayland-egl-server 
--enable-kms-egl-platform --enable-xlib-egl-platform --enable-cogl-gst">
+  <autotools id="cogl" autogenargs="--enable-xlib-egl-platform --enable-cogl-gst">
+    <if condition-set="wayland">
+      <autogenargs value="--enable-wayland-egl-platform --enable-wayland-egl-server 
--enable-kms-egl-platform"/>
+    </if>
     <pkg-config>cogl-1.0.pc</pkg-config>
     <branch revision="cogl-1.18"/>
     <dependencies>
-      <dep package="gbm"/>
       <dep package="glib"/>
       <dep package="gtk-doc"/>
       <dep package="libdrm"/>
       <dep package="libXcomposite"/>
       <dep package="xcb-dri2" />
       <dep package="pango"/>
-      <dep package="wayland"/>
-      <dep package="wayland-egl"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
+      <if condition-set="wayland">
+        <dep package="wayland"/>
+        <dep package="wayland-egl"/>
+        <dep package="gbm"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="gobject-introspection"/>
     </suggests>
   </autotools>
 
-  <autotools id="clutter" autogenargs="--enable-installed-tests --enable-wayland-backend 
--enable-wayland-compositor --enable-evdev-input --enable-egl-backend">
+  <autotools id="clutter" autogenargs="--enable-installed-tests --enable-egl-backend">
+    <if condition-set="wayland">
+      <autogenargs value="--enable-wayland-backend --enable-wayland-compositor --enable-evdev-input"/>
+    </if>
     <branch revision="clutter-1.18"/>
     <dependencies>
       <dep package="cogl"/>
@@ -336,9 +344,11 @@
       <dep package="cairo"/>
       <dep package="json-glib"/>
       <dep package="gobject-introspection"/>
-      <dep package="wayland"/>
-      <dep package="libxkbcommon"/>
-      <dep package="libinput"/>
+      <if condition-set="wayland">
+        <dep package="wayland"/>
+        <dep package="libxkbcommon"/>
+        <dep package="libinput"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="gdk-pixbuf"/>
@@ -376,7 +386,10 @@
     </after>
   </autotools>
 
-  <autotools id="gtk+" autogenargs="--enable-x11-backend --enable-wayland-backend --enable-broadway-backend 
--enable-installed-tests">
+  <autotools id="gtk+" autogenargs="--enable-x11-backend --enable-broadway-backend --enable-installed-tests">
+    <if condition-set="wayland">
+      <autogenargs value="--enable-wayland-backend"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="atk"/>
@@ -387,8 +400,10 @@
       <dep package="gtk-doc"/>
       <dep package="gobject-introspection"/>
       <dep package="at-spi2-atk"/>
-      <dep package="libxkbcommon"/>
-      <dep package="wayland"/>
+      <if condition-set="wayland">
+        <dep package="libxkbcommon"/>
+        <dep package="wayland"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="shared-mime-info"/>