[jhbuild] modules: Disable X11 if not in x11 condition

[Philip Chimento <pchimento src gnome org>]

commit ced004d8a9c50608d8d0e786eea67bf724dfe574
Author: Philip Chimento <philip chimento gmail com>
Date:   Thu Nov 3 22:11:35 2016 -0700

    modules: Disable X11 if not in x11 condition
    
    https://bugzilla.gnome.org/show_bug.cgi?id=774453

 modulesets/gnome-suites-core-3.22.modules      |    7 ++++++-
 modulesets/gnome-suites-core-3.24.modules      |    7 ++++++-
 modulesets/gnome-suites-core-deps-3.22.modules |   11 ++++++++++-
 modulesets/gnome-suites-core-deps-3.24.modules |    7 ++++++-
 4 files changed, 28 insertions(+), 4 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.22.modules b/modulesets/gnome-suites-core-3.22.modules
index e929604..b271434 100644
--- a/modulesets/gnome-suites-core-3.22.modules
+++ b/modulesets/gnome-suites-core-3.22.modules
@@ -63,11 +63,16 @@
   </autotools>
 
   <autotools id="at-spi2-core">
+    <if condition-unset="x11">
+      <autogenargs value="--disable-x11"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="glib"/>
-      <dep package="libXtst"/>
+      <if condition-set="x11">
+        <dep package="libXtst"/>
+      </if>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-suites-core-3.24.modules b/modulesets/gnome-suites-core-3.24.modules
index ff2cf4b..060cf0e 100644
--- a/modulesets/gnome-suites-core-3.24.modules
+++ b/modulesets/gnome-suites-core-3.24.modules
@@ -63,11 +63,16 @@
   </autotools>
 
   <autotools id="at-spi2-core">
+    <if condition-unset="x11">
+      <autogenargs value="--disable-x11"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="glib"/>
-      <dep package="libXtst"/>
+      <if condition-set="x11">
+        <dep package="libXtst"/>
+      </if>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-suites-core-deps-3.22.modules b/modulesets/gnome-suites-core-deps-3.22.modules
index 71c49a1..accf326 100644
--- a/modulesets/gnome-suites-core-deps-3.22.modules
+++ b/modulesets/gnome-suites-core-deps-3.22.modules
@@ -284,6 +284,10 @@
     <if condition-set="freebsd">
       <autogenargs value="DB_CFLAGS=-I/usr/local/include/db5 DB_LIBS=-ldb-5.3"/>
     </if>
+    <if condition-unset="x11">
+      <!-- Without X11, only gcr-base-1.0 is available, not gcr-1.0 -->
+      <autogenargs value="--disable-gtk"/>
+    </if>
     <branch revision="gnome-3-22"/>
     <dependencies>
       <dep package="intltool"/>
@@ -364,15 +368,20 @@
   </autotools>
 
   <autotools id="gcr">
+    <if condition-unset="x11">
+      <autogenargs value="--without-gtk"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="gnome-common"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
       <dep package="libgcrypt" />
       <dep package="libtasn1" />
       <dep package="p11-kit"/>
       <dep package="vala"/>
+      <if condition-set="x11">
+        <dep package="gtk+"/>
+      </if>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-suites-core-deps-3.24.modules b/modulesets/gnome-suites-core-deps-3.24.modules
index cc19fe8..b8f288b 100644
--- a/modulesets/gnome-suites-core-deps-3.24.modules
+++ b/modulesets/gnome-suites-core-deps-3.24.modules
@@ -384,15 +384,20 @@
   </autotools>
 
   <autotools id="gcr">
+    <if condition-unset="x11">
+      <autogenargs value="--without-gtk"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="gnome-common"/>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
       <dep package="libgcrypt" />
       <dep package="libtasn1" />
       <dep package="p11-kit"/>
       <dep package="vala"/>
+      <if condition-set="x11">
+        <dep package="gtk+-3"/>
+      </if>
     </dependencies>
   </autotools>