[gtk-osx] Add make to bootstrap.modules

[John Ralls <jralls src gnome org>]

commit 402fdc2092cadf7e2dd3717943a366e3a0871e9e
Author: John Ralls <john methuselah-4 local>
Date:   Fri Nov 18 10:09:55 2011 -0800

    Add make to bootstrap.modules
    
    It seems that the version of make which comes with Tiger (3.80) isn't
    good enough to build GObject-introspection. Builds only on Tiger
    unless you add 'skip.remove("make")' to .jhbuildrc-custom.

 jhbuildrc-gtk-osx                   |    7 ++++---
 modulesets-stable/bootstrap.modules |    6 +++++-
 2 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 9c0e82f..1b2ccc2 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -446,10 +446,10 @@ if _osx_version.startswith("7."):
     raise SystemExit
 elif _osx_version.startswith("8."):
     # Tiger, we want to use the python version from jhbuild.
-    _gtk_osx_use_jhbuild_bison_flex = True
+    _host_tiger = True
 else:
     # Leopard or newer.
-    _gtk_osx_use_jhbuild_bison_flex = False
+    _host_tiger = False
 
 ###### Import Customizations ######
 
@@ -516,7 +516,8 @@ os.environ['JHBUILD_SOURCE'] = checkoutroot
 os.environ["M4"] = _exec_prefix + "/bin/m4"
 os.environ['LIBTOOLIZE'] = _exec_prefix + '/bin/libtoolize'
 
-if not _gtk_osx_use_jhbuild_bison_flex:
+if not _host_tiger:
+    skip.append('make')
     skip.append('bison')
     skip.append('flex')
 
diff --git a/modulesets-stable/bootstrap.modules b/modulesets-stable/bootstrap.modules
index bf981f0..8217289 100644
--- a/modulesets-stable/bootstrap.modules
+++ b/modulesets-stable/bootstrap.modules
@@ -12,7 +12,10 @@
   <repository type="tarball" name="tukaani.org"
 	      href="http://tukaani.org/"/>
 
-
+  <autotools id="make">
+    <branch repo="ftp.gnu.org" module="make/make-3.82.tar.gz" version="3.82"/>
+  </autotools>
+ 
   <autotools id="xz">
     <branch repo="tukaani.org" module="xz/xz-5.0.1.tar.bz2" version="5.0.1"
             size="1005959" md5sum="cb6c7a58cec4d663a395c54d186ca0c6"
@@ -102,6 +105,7 @@
 
   <metamodule id="meta-bootstrap">
     <dependencies>
+      <dep package="make"/>     <!-- Needed for Tiger, skipped otherwise -->
       <dep package="gettext" /> <!-- Pulls in libiconv, needed for 64-bit -->
       <dep package="m4"/>	<!-- Can be skipped for Leopard and later -->
       <dep package="autoconf" />