[jhbuild] 3.18: Add m4-common as a dependency of various modules

[Philip Withnall <pwithnall src gnome org>]

commit dd5c7618d6b2e5be15cb6193ff90eac5c98ece52
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Fri Jul 10 10:59:00 2015 +0100

    3.18: Add m4-common as a dependency of various modules
    
    These are the modules I know of which use m4-common macros (even if they
    have copied them in-tree; depending on m4-common means they could use
    more up to date versions if available). I may have missed some.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=752170

 modulesets/gnome-apps-3.18.modules             |    1 +
 modulesets/gnome-suites-core-3.18.modules      |    2 ++
 modulesets/gnome-suites-core-deps-3.18.modules |    7 +++++++
 3 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.18.modules b/modulesets/gnome-apps-3.18.modules
index dee8cfc..a18a4af 100644
--- a/modulesets/gnome-apps-3.18.modules
+++ b/modulesets/gnome-apps-3.18.modules
@@ -1063,6 +1063,7 @@
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="intltool"/>
+      <dep package="m4-common"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
diff --git a/modulesets/gnome-suites-core-3.18.modules b/modulesets/gnome-suites-core-3.18.modules
index de9678f..51d2dbb 100644
--- a/modulesets/gnome-suites-core-3.18.modules
+++ b/modulesets/gnome-suites-core-3.18.modules
@@ -836,6 +836,7 @@
       <dep package="gtk+"/>
       <dep package="libxml2"/>
       <dep package="libxslt"/>
+      <dep package="m4-common"/>
       <dep package="WebKit"/>
       <dep package="yelp-xsl"/>
     </dependencies>
@@ -1019,6 +1020,7 @@
       <dep package="polkit-gobject"/>
       <dep package="polkit-agent"/>
       <dep package="libatasmart"/>
+      <dep package="m4-common"/>
       <if condition-set="systemd">
         <dep package="libsystemd"/>
         <dep package="libsystemd-daemon"/>
diff --git a/modulesets/gnome-suites-core-deps-3.18.modules b/modulesets/gnome-suites-core-deps-3.18.modules
index 1f8ccca..bd0d3a9 100644
--- a/modulesets/gnome-suites-core-deps-3.18.modules
+++ b/modulesets/gnome-suites-core-deps-3.18.modules
@@ -199,6 +199,7 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="libsoup"/>
+      <dep package="m4-common"/>
     </dependencies>
   </autotools>
 
@@ -214,6 +215,7 @@
       <dep package="libxml2"/>
       <dep package="libsoup"/>
       <dep package="liboauth"/>
+      <dep package="m4-common"/>
       <dep package="uhttpmock"/>
     </dependencies>
   </autotools>
@@ -266,6 +268,10 @@
     </dependencies>
   </autotools>
 
+  <autotools id="m4-common">
+    <branch repo="github.com" module="desrt/m4-common.git"/>
+  </autotools>
+
   <cmake id="mir" cmakeargs="-DMIR_ENABLE_TESTS=0 -DMIR_PLATFORM=mesa">
     <branch repo="mir"
             module="0.8/${version}/+download/mir-${version}.tar.bz2"
@@ -1081,6 +1087,7 @@
       <dep package="libxml2"/>
       <dep package="sqlite3"/>
       <dep package="gobject-introspection"/>
+      <dep package="m4-common"/>
     </dependencies>
     <suggests>
       <dep package="glib-networking"/>